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

Reverting 13286 to unbreak GUI and keep db calls consistent; options passed in hash. 

git-svn-id: file:///home/svn/framework3/trunk@13302 4d416f70-5f16-0410-b530-b9f4589650da
unstable
Matt Weeks 2011-07-23 00:28:36 +00:00
parent 9ebbe84a4a
commit 1d9c2a0f4f
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/msf/core/rpc/db.rb
View File

@ -987,11 +987,11 @@ public
end end
#right now workspace is the only option supported #right now workspace is the only option supported
def creds(token,wspace=nil) def creds(token,xopts)
authenticate(token) authenticate(token)
raise ::XMLRPC::FaultException.new(404, "database not loaded") if(not db) raise ::XMLRPC::FaultException.new(404, "database not loaded") if(not db)
wspace = workspace(wspace) opts = fix_options(xopts)
raise ::XMLRPC::FaultException.new(404, "unknown workspace") if(not wspace) wspace = workspace(opts[:workspace])
ret = {} ret = {}
ret[:creds] = [] ret[:creds] = []
@framework.db.creds(wspace).each do |c| @framework.db.creds(wspace).each do |c|