Land #16754, fix merge conflicts

Author: jheysel-r7

modules/exploits/windows/iis/ms02_065_msadc.rb

@@ -35,7 +35,7 @@ def initialize(info = {})
         'Privileged' => false,
         'Payload' => {
           'Space' => 1024,
-          'BadChars' => "\x00\x09\x0a\x0b\x0d\x20\x22\x27:?<>=$\\/;=+%#&",
+          'BadChars' => "\x00\x09\x0a\x0b\x0d\x20\x22\x27:?<>=$\\/;=+%#&", # "\u0000\t\n\v\r \"':?<>=$\\/;=+%#&"
           'StackAdjustment' => -3500
         },
         'DefaultOptions' => {
@@ -65,11 +65,9 @@ def initialize(info = {})
       )
     )
 
-    register_options(
-      [
-        OptString.new('TARGETURI', [ true, 'The path to msadcs.dll', '/msadc/msadcs.dll' ]),
-      ]
-    )
+    register_options([
+      OptString.new('TARGETURI', [ true, 'The path to msadcs.dll', '/msadc/msadcs.dll' ], aliases: [ 'PATH' ]),
+    ])
   end
 
   def check