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

Fix RPC typos. 

def_ prefixes and remove calls to nonexistant clean_nils function. Msgpack libs should not require clean_nils.



git-svn-id: file:///home/svn/framework3/trunk@13615 4d416f70-5f16-0410-b530-b9f4589650da
unstable
Matt Weeks 2011-08-24 01:01:48 +00:00
parent c8a0039b98
commit 32eb5d05ba
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lib/msf/core/rpc/v10/rpc_db.rb
View File

@ -169,7 +169,7 @@ public
end end
def def_vulns(xopts) def rpc_vulns(xopts)
db_check db_check
@ -256,7 +256,7 @@ public
vuln[:refs] = reflist.join(',') vuln[:refs] = reflist.join(',')
ret[:vulns] << vuln ret[:vulns] << vuln
end end
clean_nils(ret) ret
end end
def rpc_workspaces def rpc_workspaces
@ -281,7 +281,7 @@ public
def rpc_get_workspace(wspace) def rpc_get_workspace(wspace)
db_check db_check
wspace = workspace(wspace) wspace = find_workspace(wspace)
ret = {} ret = {}
ret[:workspace] = [] ret[:workspace] = []
if(wspace) if(wspace)
@ -525,7 +525,7 @@ public
{ :result => 'failed' } { :result => 'failed' }
end end
def def_notes(xopts) def rpc_notes(xopts)
db_check db_check
opts = fix_options(xopts) opts = fix_options(xopts)
wspace = find_workspace(opts[:workspace]) if opts[:workspace] wspace = find_workspace(opts[:workspace]) if opts[:workspace]
@ -873,7 +873,7 @@ public
def rpc_events(wspace = nil) def rpc_events(wspace = nil)
db_check db_check
wspace = rpc_workspace(wspace) wspace = find_workspace(wspace)
error(500, "Unknown Workspace") if(not wspace) error(500, "Unknown Workspace") if(not wspace)
ret = {} ret = {}
ret[:events] = [] ret[:events] = []
@ -915,7 +915,7 @@ public
def rpc_loots(wspace=nil) def rpc_loots(wspace=nil)
db_check db_check
wspace = workspace(wspace) wspace = find_workspace(wspace)
error(500, "Unknown Workspace") if(not wspace) error(500, "Unknown Workspace") if(not wspace)
ret = {} ret = {}
@ -975,7 +975,6 @@ public
self.framework.db.import(opts) self.framework.db.import(opts)
return { :result => 'success' } return { :result => 'success' }
end end
def rpc_get_vuln(xopts) def rpc_get_vuln(xopts)
db_check db_check
@ -1066,7 +1065,7 @@ public
client[:updated_at] = c.updated_at.to_i client[:updated_at] = c.updated_at.to_i
ret[:clients] << client ret[:clients] << client
end end
clean_nils(ret) ret
end end
def rpc_del_client(xopts) def rpc_del_client(xopts)