Respect NEVEROP in chanserv/set/{founder,successor}.

1 files changed, 12 insertions, 0 deletions

diff --git a/modules/chanserv/cs_set.cpp b/modules/chanserv/cs_set.cpp
index c77d2d675..9cc41a715 100644
--- a/modules/chanserv/cs_set.cpp
+++ b/modules/chanserv/cs_set.cpp
@@ -311,6 +311,12 @@ public:
 			source.Reply(NICK_X_NOT_REGISTERED, params[1].c_str());
 			return;
 		}
+		else if (na->nc->HasExt("NEVEROP"))
+		{
+			source.Reply(_("\002%s\002 does not wish to be added to channel access lists."),
+				na->nc->display.c_str());
+			return;
+		}
 
 		NickCore *nc = na->nc;
 		unsigned max_reg = Config->GetModule("chanserv").Get<unsigned>("maxregistered");
@@ -974,6 +980,12 @@ public:
 				source.Reply(NICK_X_NOT_REGISTERED, param.c_str());
 				return;
 			}
+			else if (na->nc->HasExt("NEVEROP"))
+			{
+				source.Reply(_("\002%s\002 does not wish to be added to channel access lists."),
+					na->nc->display.c_str());
+				return;
+			}
 			if (na->nc == ci->GetFounder())
 			{
 				source.Reply(_("%s cannot be the successor on channel %s as they are the founder."), na->nick.c_str(), ci->name.c_str());