From 3b2c43fac4ec06a995bb2c835608cd8f8dbc8de9 Mon Sep 17 00:00:00 2001
From: James Lee <James_Lee@rapid7.com>
Date: Fri, 22 Oct 2010 20:07:18 +0000
Subject: [PATCH] get rid of the redundant second java target

git-svn-id: file:///home/svn/framework3/trunk@10785 4d416f70-5f16-0410-b530-b9f4589650da
---
 modules/exploits/multi/http/tomcat_mgr_deploy.rb | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/modules/exploits/multi/http/tomcat_mgr_deploy.rb b/modules/exploits/multi/http/tomcat_mgr_deploy.rb
index fb34bf3d4b..8092f549ad 100644
--- a/modules/exploits/multi/http/tomcat_mgr_deploy.rb
+++ b/modules/exploits/multi/http/tomcat_mgr_deploy.rb
@@ -72,7 +72,7 @@ class Metasploit3 < Msf::Exploit::Remote
 					#
 					[ 'Automatic', { } ],
 
-					[ 'Java',
+					[ 'Java Universal',
 						{
 							'Arch' => ARCH_JAVA,
 							'Platform' => 'java'
@@ -101,16 +101,6 @@ class Metasploit3 < Msf::Exploit::Remote
 							'Arch' => ARCH_X86_64,
 							'Platform' => 'linux'
 						},
-					],
-
-					[ 'Java Universal',
-						{
-							'Arch' => ARCH_JAVA,
-							'Payload' =>
-								{
-									'DisableNops' => true
-								}
-						}
 					]
 				],
 			'DefaultTarget'  => 0,