fixes for telnet wierdness

had to work around the way the old
Auxiliary::Login mixin worked. Scanner
now works properly

lib/metasploit/framework/login_scanner/telnet.rb

@@ -64,8 +64,8 @@ module Metasploit
               recv_telnet(self.sock, 0.10) unless @recvd.nil? or @recvd[/#{@password_prompt}/]
             end
 
-            if password_prompt?(user)
-              send_pass(pass)
+            if password_prompt?(credential.public)
+              send_pass(credential.private)
 
               # Allow for slow echos
               1.upto(10) do
@@ -84,6 +84,19 @@ module Metasploit
           ::Metasploit::Framework::LoginScanner::Result.new(result_options)
         end
 
+        private
+
+        # This method sets the sane defaults for things
+        # like timeouts and TCP evasion options
+        def set_sane_defaults
+          self.max_send_size  ||= 0
+          self.send_delay     ||= 0
+          self.banner_timeout ||= 25
+          self.telnet_timeout ||= 10
+
+          # Shim to set up the ivars from the old Login mixin
+          create_login_ivars
+        end
 
       end
     end

lib/msf/core/auxiliary/login.rb

@@ -21,6 +21,10 @@ module Auxiliary::Login
   def initialize(info = {})
     super
 
+    create_login_ivars
+  end
+
+  def create_login_ivars
     # Appended to by each read and gets reset after each send.  Doing it
     # this way lets us deal with partial reads in the middle of expect
     # strings, e.g., the first recv returns "Pa" and the second returns