The db search already prints results, return after

HD Moore · HD Moore · commit 30d7de3157a8 · 2012-12-02T01:14:56.000-06:00
diff --git a/lib/msf/ui/console/command_dispatcher/core.rb b/lib/msf/ui/console/command_dispatcher/core.rb
@@ -1335,13 +1335,11 @@ def cmd_search(*args)
 		}
 
 		if framework.db and framework.db.migrated and framework.db.modules_cached
-			sql_results = search_modules_sql(match)
-			return sql_results if sql_results # Patches around #7553
-		else
-			print_warning("Database not connected or cache not built.")
+			search_modules_sql(match)
+			return
 		end
 
-		print_warning("Falling back to slow search.")
+		print_warning("Database not connected or cache not built, using slow search")
 
 		tbl = generate_module_table("Matching Modules")
 		[

Original file line number	Diff line number	Diff line change
`@@ -1335,13 +1335,11 @@ def cmd_search(*args)`
`1335`	`1335`	`}`
`1336`	`1336`
`1337`	`1337`	`if framework.db and framework.db.migrated and framework.db.modules_cached`
`1338`		`- sql_results = search_modules_sql(match)`
`1339`		`- return sql_results if sql_results # Patches around #7553`
`1340`		`- else`
`1341`		`- print_warning("Database not connected or cache not built.")`
	`1338`	`+ search_modules_sql(match)`
	`1339`	`+ return`
`1342`	`1340`	`end`
`1343`	`1341`
`1344`		`- print_warning("Falling back to slow search.")`
	`1342`	`+ print_warning("Database not connected or cache not built, using slow search")`
`1345`	`1343`
`1346`	`1344`	`tbl = generate_module_table("Matching Modules")`
`1347`	`1345`	`[`