Land #6429, LHOST tab completion nil fix
commit
938cc2e4c4
|
@ -1251,7 +1251,7 @@ class Core
|
|||
print_status("Successfully loaded plugin: #{inst.name}")
|
||||
end
|
||||
rescue ::Exception => e
|
||||
elog("Error loading plugin #{path}: #{e}\n\n#{e.backtrace.join("\n")}", src = 'core', level = 0, from = caller)
|
||||
elog("Error loading plugin #{path}: #{e}\n\n#{e.backtrace.join("\n")}", 'core', 0, caller)
|
||||
print_error("Failed to load plugin from #{path}: #{e}")
|
||||
end
|
||||
end
|
||||
|
@ -2222,7 +2222,7 @@ class Core
|
|||
end
|
||||
|
||||
mod.options.sorted.each { |e|
|
||||
name, opt = e
|
||||
name, _opt = e
|
||||
res << name
|
||||
}
|
||||
|
||||
|
@ -2244,7 +2244,7 @@ class Core
|
|||
p = framework.payloads.create(mod.datastore['PAYLOAD'])
|
||||
if (p)
|
||||
p.options.sorted.each { |e|
|
||||
name, opt = e
|
||||
name, _opt = e
|
||||
res << name
|
||||
}
|
||||
end
|
||||
|
@ -3090,7 +3090,9 @@ class Core
|
|||
# getifaddrs was introduced in 2.1.2
|
||||
if Socket.respond_to?(:getifaddrs)
|
||||
ifaddrs = Socket.getifaddrs.find_all do |ifaddr|
|
||||
((ifaddr.flags & Socket::IFF_LOOPBACK) == 0) && ifaddr.addr.ip?
|
||||
((ifaddr.flags & Socket::IFF_LOOPBACK) == 0) &&
|
||||
ifaddr.addr &&
|
||||
ifaddr.addr.ip?
|
||||
end
|
||||
res += ifaddrs.map { |ifaddr| ifaddr.addr.ip_address }
|
||||
end
|
||||
|
|
Loading…
Reference in New Issue