Merge remote-tracking branch 'kernelsmith/RM7676-migrate-h' into rapid7

egypt · egypt · commit ab64c428abd1 · 2013-01-10T17:24:11.000-06:00
diff --git a/lib/rex/post/meterpreter/ui/console/command_dispatcher/core.rb b/lib/rex/post/meterpreter/ui/console/command_dispatcher/core.rb
@@ -329,8 +329,11 @@ def cmd_migrate_help
 	#
 	# Migrates the server to the supplied process identifier.
 	#
+	# @param args [Array<String>] Commandline arguments, only -h or a pid
+	# @return [void]
+
 	def cmd_migrate(*args)
-		if (args.length == 0)
+		if ( args.length == 0 or args.include?("-h") )
 			cmd_migrate_help
 			return true
 		end

Original file line number	Diff line number	Diff line change
`@@ -329,8 +329,11 @@ def cmd_migrate_help`
`329`	`329`	`#`
`330`	`330`	`# Migrates the server to the supplied process identifier.`
`331`	`331`	`#`
	`332`	`+ # @param args [Array<String>] Commandline arguments, only -h or a pid`
	`333`	`+ # @return [void]`
	`334`	`+`
`332`	`335`	`def cmd_migrate(*args)`
`333`		`- if (args.length == 0)`
	`336`	`+ if ( args.length == 0 or args.include?("-h") )`
`334`	`337`	`cmd_migrate_help`
`335`	`338`	`return true`
`336`	`339`	`end`