From a35564c723b4fd1017d0b04d5b987ba250973dd3 Mon Sep 17 00:00:00 2001 From: Stephen Haywood Date: Sat, 17 Dec 2011 18:46:30 -0500 Subject: [PATCH 1/2] cosmetic changes to openvas plugin output --- plugins/openvas.rb | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/plugins/openvas.rb b/plugins/openvas.rb index 46722a58df..9fb5636aa0 100644 --- a/plugins/openvas.rb +++ b/plugins/openvas.rb @@ -263,9 +263,9 @@ class Plugin::OpenVAS < Msf::Plugin id += 1 end print_good("OpenVAS list of targets") - print_good "\n" - print_good tbl.to_s - print_good "\n" + puts + puts tbl.to_s + puts rescue OpenVASOMP::OMPError => e print_error(e.to_s) end @@ -328,9 +328,9 @@ class Plugin::OpenVAS < Msf::Plugin id += 1 end print_good("OpenVAS list of tasks") - print_good "\n" - print_good tbl.to_s - print_good "\n" + puts + puts tbl.to_s + puts rescue OpenVASOMP::OMPError => e print_error(e.to_s) end @@ -427,9 +427,9 @@ class Plugin::OpenVAS < Msf::Plugin id += 1 end print_good("OpenVAS list of configs") - print_good "\n" - print_good tbl.to_s - print_good "\n" + puts + puts tbl.to_s + puts rescue OpenVASOMP::OMPError => e print_error(e.to_s) end @@ -450,9 +450,9 @@ class Plugin::OpenVAS < Msf::Plugin id += 1 end print_good("OpenVAS list of report formats") - print_good "\n" - print_good tbl.to_s - print_good "\n" + puts + puts tbl.to_s + puts rescue OpenVASOMP::OMPError => e print_error(e.to_s) end @@ -473,9 +473,9 @@ class Plugin::OpenVAS < Msf::Plugin id += 1 end print_good("OpenVAS list of reports") - print_good "\n" - print_good tbl.to_s - print_good "\n" + puts + puts tbl.to_s + puts rescue OpenVASOMP::OMPError => e print_error(e.to_s) end From 18635387d5be3603e9662a3c972e4b7f277fe8c6 Mon Sep 17 00:00:00 2001 From: Stephen Haywood Date: Sun, 18 Dec 2011 20:03:49 -0500 Subject: [PATCH 2/2] Changed puts to print_line. --- plugins/openvas.rb | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/plugins/openvas.rb b/plugins/openvas.rb index 9fb5636aa0..247a0b7a7d 100644 --- a/plugins/openvas.rb +++ b/plugins/openvas.rb @@ -263,9 +263,9 @@ class Plugin::OpenVAS < Msf::Plugin id += 1 end print_good("OpenVAS list of targets") - puts - puts tbl.to_s - puts + print_line + print_line tbl.to_s + print_line rescue OpenVASOMP::OMPError => e print_error(e.to_s) end @@ -328,9 +328,9 @@ class Plugin::OpenVAS < Msf::Plugin id += 1 end print_good("OpenVAS list of tasks") - puts - puts tbl.to_s - puts + print_line + print_line tbl.to_s + print_line rescue OpenVASOMP::OMPError => e print_error(e.to_s) end @@ -427,9 +427,9 @@ class Plugin::OpenVAS < Msf::Plugin id += 1 end print_good("OpenVAS list of configs") - puts - puts tbl.to_s - puts + print_line + print_line tbl.to_s + print_line rescue OpenVASOMP::OMPError => e print_error(e.to_s) end @@ -450,9 +450,9 @@ class Plugin::OpenVAS < Msf::Plugin id += 1 end print_good("OpenVAS list of report formats") - puts - puts tbl.to_s - puts + print_line + print_line tbl.to_s + print_line rescue OpenVASOMP::OMPError => e print_error(e.to_s) end @@ -473,9 +473,9 @@ class Plugin::OpenVAS < Msf::Plugin id += 1 end print_good("OpenVAS list of reports") - puts - puts tbl.to_s - puts + print_line + print_line tbl.to_s + print_line rescue OpenVASOMP::OMPError => e print_error(e.to_s) end