infosecn1nja
/
metasploit-framework
mirror of https://github.com/infosecn1nja/metasploit-framework.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

give the timeout a default value. fixes everything that uses shell_command_token_* with one arg 

git-svn-id: file:///home/svn/framework3/trunk@11800 4d416f70-5f16-0410-b530-b9f4589650da
unstable
James Lee 2011-02-23 01:33:39 +00:00
parent aa859e2f68
commit f647088fba
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/msf/core/session/provider/single_command_shell.rb
View File

@ -88,7 +88,7 @@ module SingleCommandShell
# Explicitly run a single command and return the output.
# This version uses a marker to denote the end of data (instead of a timeout).
#
def shell_command_token_unix(cmd,timeout)
def shell_command_token_unix(cmd, timeout=10)
# read any pending data
buf = shell_read(-1, 0.01)
token = ::Rex::Text.rand_text_alpha(32)
@ -103,7 +103,7 @@ module SingleCommandShell
# Explicitly run a single command and return the output.
# This version uses a marker to denote the end of data (instead of a timeout).
#
def shell_command_token_win32(cmd,timeout)
def shell_command_token_win32(cmd, timeout=10)
# read any pending data
buf = shell_read(-1, 0.01)
token = ::Rex::Text.rand_text_alpha(32)