From 69f03f5c5decb88e9455ba4e5cdcf85f269f7555 Mon Sep 17 00:00:00 2001
From: Jon Hart <jon_hart@rapid7.com>
Date: Mon, 12 Jan 2015 19:43:57 -0800
Subject: [PATCH] Move ACPP default port into Rex

---
 lib/metasploit/framework/login_scanner/acpp.rb | 4 ++--
 lib/rex/proto/acpp.rb                          | 8 ++++++++
 modules/auxiliary/scanner/acpp/login.rb        | 2 +-
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/lib/metasploit/framework/login_scanner/acpp.rb b/lib/metasploit/framework/login_scanner/acpp.rb
index 07841c0c7a..1f01e59d04 100644
--- a/lib/metasploit/framework/login_scanner/acpp.rb
+++ b/lib/metasploit/framework/login_scanner/acpp.rb
@@ -17,8 +17,8 @@ module Metasploit
         #
         # CONSTANTS
         #
-        DEFAULT_PORT         = 5009
-        LIKELY_PORTS         = [ 5009 ]
+        DEFAULT_PORT         = Rex::Proto::ACPP::DEFAULT_PORT
+        LIKELY_PORTS         = [ DEFAULT_PORT ]
         LIKELY_SERVICE_NAMES = [ 'acpp' ]
         PRIVATE_TYPES        = [ :password ]
         REALM_KEY            = nil
diff --git a/lib/rex/proto/acpp.rb b/lib/rex/proto/acpp.rb
index 9ff23d1e4b..2cd7b083e4 100644
--- a/lib/rex/proto/acpp.rb
+++ b/lib/rex/proto/acpp.rb
@@ -7,3 +7,11 @@
 
 require 'rex/proto/acpp/client'
 require 'rex/proto/acpp/message'
+
+module Rex
+  module Proto
+    module ACPP
+      DEFAULT_PORT = 5009
+    end
+  end
+end
diff --git a/modules/auxiliary/scanner/acpp/login.rb b/modules/auxiliary/scanner/acpp/login.rb
index ed6b599810..4bc60fa84b 100644
--- a/modules/auxiliary/scanner/acpp/login.rb
+++ b/modules/auxiliary/scanner/acpp/login.rb
@@ -34,7 +34,7 @@ class Metasploit3 < Msf::Auxiliary
 
     register_options(
       [
-        Opt::RPORT(5009)
+        Opt::RPORT(Rex::Proto::ACPP::DEFAULT_PORT)
       ], self.class)
 
     deregister_options(