Update from upstream/master

modules/auxiliary/gather/d20pass.rb

@@ -28,6 +28,10 @@ class Metasploit3 < Msf::Auxiliary
       },
       'Author'         => [ 'K. Reid Wightman <wightman[at]digitalbond.com>' ],
       'License'        => MSF_LICENSE,
+      'References'     =>
+        [
+          ['CVE', '2012-6663'],
+        ],
       'DisclosureDate' => 'Jan 19 2012'
       ))
 

modules/auxiliary/scanner/tftp/ipswitch_whatsupgold_tftp.rb

@@ -29,7 +29,8 @@ class Metasploit3 < Msf::Auxiliary
           ['OSVDB', '77455'],
           ['BID', '50890'],
           ['EDB', '18189'],
-          ['URL', 'http://secpod.org/advisories/SecPod_Ipswitch_TFTP_Server_Dir_Trav.txt']
+          ['URL', 'http://secpod.org/advisories/SecPod_Ipswitch_TFTP_Server_Dir_Trav.txt'],
+          ['CVE', '2011-4722']
         ],
       'DisclosureDate' => "Dec 12 2011"
     ))

modules/auxiliary/spoof/cisco/dtp.rb

@@ -31,6 +31,13 @@ class Metasploit3 < Msf::Auxiliary
     deregister_options('RHOST', 'PCAPFILE')
   end
 
+  def setup
+    super
+    unless datastore['SMAC'] || datastore['INTERFACE']
+      raise ArgumentError, 'Must specify SMAC or INTERFACE'
+    end
+  end
+
   def build_dtp_frame
     p = PacketFu::EthPacket.new
     p.eth_daddr = '01:00:0c:cc:cc:cc'

modules/exploits/windows/tftp/distinct_tftp_traversal.rb

@@ -31,7 +31,8 @@ class Metasploit3 < Msf::Exploit::Remote
         [
           ['OSVDB', '80984'],
           ['EDB', '18718'],
-          ['URL', 'http://www.spentera.com/advisories/2012/SPN-01-2012.pdf']
+          ['URL', 'http://www.spentera.com/advisories/2012/SPN-01-2012.pdf'],
+          ['CVE', '2012-6664']
         ],
       'Payload'        =>
         {