Skip to content

Commit 0a5119a

Browse files
committed
Land rapid7#5702, vprint_* optional parameter
2 parents 53bcee0 + d795b2f commit 0a5119a

File tree

5 files changed

+10
-10
lines changed

5 files changed

+10
-10
lines changed
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module Msf::Module::UI::Line::Verbose
22
# Verbose version of #print_line
3-
def vprint_line(msg)
3+
def vprint_line(msg='')
44
print_line(msg) if datastore['VERBOSE'] || framework.datastore['VERBOSE']
55
end
6-
end
6+
end
Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
11
module Msf::Module::UI::Message::Verbose
22
# Verbose version of #print_error
3-
def vprint_error(msg)
3+
def vprint_error(msg='')
44
print_error(msg) if datastore['VERBOSE'] || framework.datastore['VERBOSE']
55
end
66

77
# Verbose version of #print_good
8-
def vprint_good(msg)
8+
def vprint_good(msg='')
99
print_good(msg) if datastore['VERBOSE'] || framework.datastore['VERBOSE']
1010
end
1111

1212
# Verbose version of #print_status
13-
def vprint_status(msg)
13+
def vprint_status(msg='')
1414
print_status(msg) if datastore['VERBOSE'] || framework.datastore['VERBOSE']
1515
end
1616

1717
# Verbose version of #print_warning
18-
def vprint_warning(msg)
18+
def vprint_warning(msg='')
1919
print_warning(msg) if datastore['VERBOSE'] || framework.datastore['VERBOSE']
2020
end
21-
end
21+
end

modules/auxiliary/scanner/http/jenkins_enum.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -221,6 +221,6 @@ def parse_system_info(body)
221221
# Report a jenkins information note for future analysis, tied to this service
222222
report_note(:host => rhost, :port => rport, :proto => 'tcp', :ntype => 'jenkins.info', :data => jinfo)
223223

224-
vprint_line('')
224+
vprint_line
225225
end
226226
end

modules/auxiliary/scanner/http/symantec_brightmail_logfile.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ def download_file(sid, fname)
118118
return
119119
end
120120

121-
vprint_line("")
121+
vprint_line
122122
vprint_line(res.body)
123123

124124
f = ::File.basename(fname)

modules/post/multi/manage/dbvis_add_db_admin.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,7 @@ def dbvis_query(dbvis,sql)
208208
dbvis = "\"#{dbvis}\""
209209
cmd = "#{dbvis} #{args}"
210210
resp = cmd_exec(cmd)
211-
vprint_line("")
211+
vprint_line
212212
vprint_status("#{resp}")
213213
if resp =~ /denied|failed/i
214214
error = true

0 commit comments

Comments
 (0)