Only show UHNAMES and NAMESX in 005 if the cap module is loaded.

The legacy method of enabling these extensions is just a wrapper
around the capability. If the cap module is not loaded it can not
be enabled so we should not advertise it.

diff --git a/src/modules/m_namesx.cpp b/src/modules/m_namesx.cpp
index 2b4fd87b4daf50c87b209a9832500a122cc77509..d91b6b050224fcdbebbbc3a2ef5c7ec69820d42e 100644 (file)
--- a/src/modules/m_namesx.cpp
+++ b/src/modules/m_namesx.cpp
@@ -48,7 +48,10 @@ class ModuleNamesX
 
        void On005Numeric(std::map<std::string, std::string>& tokens) CXX11_OVERRIDE
        {
-               tokens["NAMESX"];
+               // The legacy PROTOCTL system is a wrapper around the cap.
+               dynamic_reference_nocheck<Cap::Manager> capmanager(this, "capmanager");
+               if (capmanager)
+                       tokens["NAMESX"];
        }
 
        ModResult OnPreCommand(std::string& command, CommandBase::Params& parameters, LocalUser* user, bool validated) CXX11_OVERRIDE

diff --git a/src/modules/m_uhnames.cpp b/src/modules/m_uhnames.cpp
index 420ba2c846d7ecaa9276c16dfc62badf371c0d5d..3bf63a3553ee4159061bdb2a7a82997006be45f0 100644 (file)
--- a/src/modules/m_uhnames.cpp
+++ b/src/modules/m_uhnames.cpp
@@ -44,7 +44,10 @@ class ModuleUHNames
 
        void On005Numeric(std::map<std::string, std::string>& tokens) CXX11_OVERRIDE
        {
-               tokens["UHNAMES"];
+               // The legacy PROTOCTL system is a wrapper around the cap.
+               dynamic_reference_nocheck<Cap::Manager> capmanager(this, "capmanager");
+               if (capmanager)
+                       tokens["UHNAMES"];
        }
 
        ModResult OnPreCommand(std::string& command, CommandBase::Params& parameters, LocalUser* user, bool validated) CXX11_OVERRIDE