Merge branch '4306' into 4305

Author: jhart-r7

modules/auxiliary/scanner/discovery/arp_sweep.rb

@@ -30,7 +30,7 @@ def initialize
       OptInt.new('TIMEOUT', [true, 'The number of seconds to wait for new data', 5]),
     ], self.class)
 
-    deregister_options('SNAPLEN', 'FILTER', 'PCAPFILE', 'UDP_SECRET', 'GATEWAY', 'NETMASK')
+    deregister_options('SNAPLEN', 'FILTER', 'PCAPFILE', 'UDP_SECRET', 'GATEWAY')
   end
 
   def run_batch_size

modules/auxiliary/server/icmp_exfil.rb

@@ -57,7 +57,7 @@ def initialize
       OptAddress.new('LOCALIP', [false, 'The IP address of the local interface'])
     ], self.class)
 
-    deregister_options('SNAPLEN','FILTER','PCAPFILE','RHOST','UDP_SECRET','GATEWAY','NETMASK', 'TIMEOUT')
+    deregister_options('SNAPLEN','FILTER','PCAPFILE','RHOST','UDP_SECRET','GATEWAY', 'TIMEOUT')
   end
 
   def run

modules/auxiliary/spoof/arp/arp_poisoning.rb

@@ -47,7 +47,7 @@ def initialize
       OptBool.new(  'BROADCAST',    	[true, 'If set, the module will send replies on the broadcast address witout consideration of DHOSTS', false])
     ], self.class)
 
-    deregister_options('SNAPLEN', 'FILTER', 'PCAPFILE','RHOST','UDP_SECRET','GATEWAY','NETMASK')
+    deregister_options('SNAPLEN', 'FILTER', 'PCAPFILE','RHOST','UDP_SECRET','GATEWAY')
   end
 
   def run

modules/auxiliary/spoof/replay/pcap_replay.rb

@@ -27,7 +27,7 @@ def initialize
       OptInt.new('PKT_DELAY', [true, "the delay in millisecond between each packet",0]),
     ], self.class)
 
-    deregister_options('SNAPLEN','FILTER','PCAPFILE','RHOST','TIMEOUT','UDP_SECRET','GATEWAY','NETMASK')
+    deregister_options('SNAPLEN','FILTER','PCAPFILE','RHOST','TIMEOUT','UDP_SECRET','GATEWAY')
   end
 
   def run

modules/exploits/windows/misc/wireshark_packet_dect.rb

@@ -65,7 +65,7 @@ def initialize(info = {})
 
     ], self.class)
 
-    deregister_options('FILTER','PCAPFILE','RHOST','SNAPLEN','TIMEOUT','UDP_SECRET','NETMASK','GATEWAY')
+    deregister_options('FILTER','PCAPFILE','RHOST','SNAPLEN','TIMEOUT','UDP_SECRET','GATEWAY')
   end
 
   def junk