working on freefloatftp_user.rb
freefloatftp_user.rb
Merge branch 'master' into freefloatftp_user
...
got freefloatftp_user.rb working
added description
description spacing
changed return address
added CHECK functionality to the existing module
adjusted DOS part to use HttpClient
This allows the ruby payloads to work properly on Windows
Fix a typo and always treat ports as integers:
Handle invalid commands gracefully (dont exit)
Convert user/pass tokens to ASCII in db.rb

This commit fixes an Encoding::CompatibilityError incompatible
encoding regexp match (ASCII-8BIT regexp with UTF-8 string) when
sanitizing non-printable tokens from a user/pass string.

The UTF-8 strings are derived from strings passed through the
module.execute RPC call.
Unconflicting ruby_string method

Looks like the conflict was created by the msftidy fixes that happened
over on the master branch. No big deal after all.
RZL_READ_DIR_LOCAL (directory listing and SMB relay)
PFL_CHECK_OS_FILE_EXISTENCE (file existence and SMB relay)
Merge branch 'master' of github.com:shellster/metasploit-framework into shellster-master
Merge branch 'master' of git://github.com/rapid7/metasploit-framework
Add dlink pass for #1648