Also have m_ldap_authentication disable nick grouping if registration is disabled

1 files changed, 8 insertions, 4 deletions

diff --git a/modules/extra/m_ldap_authentication.cpp b/modules/extra/m_ldap_authentication.cpp
index e3613051f..5db8382ee 100644
--- a/modules/extra/m_ldap_authentication.cpp
+++ b/modules/extra/m_ldap_authentication.cpp
@@ -243,12 +243,16 @@ class NSIdentifyLDAP : public Module
 
 	EventReturn OnPreCommand(CommandSource &source, Command *command, std::vector<Anope::string> &params) anope_override
 	{
-		if (!this->disable_register_reason.empty() && command->name == "nickserv/register")
+		if (!this->disable_register_reason.empty())
 		{
-			source.Reply(this->disable_register_reason);
-			return EVENT_STOP;
+			if (command->name == "nickserv/register" || command->name == "nickserv/group")
+			{
+				source.Reply(this->disable_register_reason);
+				return EVENT_STOP;
+			}
 		}
-		else if (!email_attribute.empty() && !this->disable_email_reason.empty() && command->name == "nickserv/set/email")
+
+		if (!email_attribute.empty() && !this->disable_email_reason.empty() && command->name == "nickserv/set/email")
 		{
 			source.Reply(this->disable_email_reason);
 			return EVENT_STOP;