fix logic errors introduced by is_system? changes. see r11998 and r12018

git-svn-id: file:///home/svn/framework3/trunk@12019 4d416f70-5f16-0410-b530-b9f4589650da
unstable
James Lee 2011-03-18 21:15:31 +00:00
parent db55db6a2e
commit d1d4f9f798
3 changed files with 6 additions and 6 deletions

View File

@ -22,7 +22,7 @@ opts.parse(args) { |opt, idx, val|
def hkcu_base def hkcu_base
key_base = [] key_base = []
if is_system? if not is_system?
key_base << "HKCU" key_base << "HKCU"
else else
key = "HKU\\" key = "HKU\\"
@ -96,4 +96,4 @@ if client.platform =~ /win32|win64/
else else
print_error("This version of Meterpreter is not supported with this Script!") print_error("This version of Meterpreter is not supported with this Script!")
raise Rex::Script::Completed raise Rex::Script::Completed
end end

View File

@ -77,7 +77,7 @@ if client.platform =~ /win32|64/
# Enumerate shares being offered # Enumerate shares being offered
enum_conf_shares() enum_conf_shares()
if is_system? if not is_system?
mount_history = enum_recent_mounts("HKEY_CURRENT_USER") mount_history = enum_recent_mounts("HKEY_CURRENT_USER")
run_history = enum_run_unc("HKEY_CURRENT_USER") run_history = enum_run_unc("HKEY_CURRENT_USER")
else else
@ -115,4 +115,4 @@ if client.platform =~ /win32|64/
else else
print_error("This version of Meterpreter is not supported with this Script!") print_error("This version of Meterpreter is not supported with this Script!")
raise Rex::Script::Completed raise Rex::Script::Completed
end end

View File

@ -102,7 +102,7 @@ def enum_viclient
end end
end end
if is_system? if not is_system?
recentconns = registry_getvaldata("HKCU\\Software\\VMware\\VMware Infrastructure Client\\Preferences","RecentConnections").split(",") recentconns = registry_getvaldata("HKCU\\Software\\VMware\\VMware Infrastructure Client\\Preferences","RecentConnections").split(",")
print_status("Recent VI Client Connections:") print_status("Recent VI Client Connections:")
recentconns.each do |c| recentconns.each do |c|
@ -323,4 +323,4 @@ if client.platform =~ /win32|win64/
else else
print_error("This version of Meterpreter is not supported with this Script!") print_error("This version of Meterpreter is not supported with this Script!")
raise Rex::Script::Completed raise Rex::Script::Completed
end end