summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--modules/core/cs_access.cpp4
-rw-r--r--modules/core/cs_set_xop.cpp2
-rw-r--r--modules/core/cs_xop.cpp4
-rw-r--r--src/regchannel.cpp2
4 files changed, 1 insertions, 11 deletions
diff --git a/modules/core/cs_access.cpp b/modules/core/cs_access.cpp
index 06cb7299d..cf2e2c34a 100644
--- a/modules/core/cs_access.cpp
+++ b/modules/core/cs_access.cpp
@@ -197,10 +197,6 @@ class CommandCSAccess : public Command
bool override = !check_access(u, ci, CA_ACCESS_CHANGE) || level >= u_level;
- NickAlias *na = findnick(mask);
- if (!na && mask.find_first_of("!@*") == Anope::string::npos)
- mask += "!*@*";
-
ChanAccess *access = ci->GetAccess(mask, 0, false);
if (access)
{
diff --git a/modules/core/cs_set_xop.cpp b/modules/core/cs_set_xop.cpp
index a7f627263..256fca0bf 100644
--- a/modules/core/cs_set_xop.cpp
+++ b/modules/core/cs_set_xop.cpp
@@ -17,7 +17,7 @@
class CommandCSSetXOP : public Command
{
public:
- CommandCSSetXOP(Module *creator, const Anope::string &cname = "chanserv/set/xop", const Anope::string &cpermission = "") : Command(creator, "chanserv/xop", 2, 2, cpermission)
+ CommandCSSetXOP(Module *creator, const Anope::string &cname = "chanserv/set/xop", const Anope::string &cpermission = "") : Command(creator, cname, 2, 2, cpermission)
{
this->SetDesc(_("Toggle the user privilege system"));
this->SetSyntax(_("\037channel\037 XOP {ON | OFF}"));
diff --git a/modules/core/cs_xop.cpp b/modules/core/cs_xop.cpp
index 05981bf4b..1b9fae93e 100644
--- a/modules/core/cs_xop.cpp
+++ b/modules/core/cs_xop.cpp
@@ -138,10 +138,6 @@ class XOPBase : public Command
return;
}
- NickAlias *na = findnick(mask);
- if (!na && mask.find_first_of("!@*") == Anope::string::npos)
- mask += "!*@*";
-
access = ci->GetAccess(mask, 0, false);
if (access)
{
diff --git a/src/regchannel.cpp b/src/regchannel.cpp
index 5a6159adc..65613097b 100644
--- a/src/regchannel.cpp
+++ b/src/regchannel.cpp
@@ -21,8 +21,6 @@ ChanAccess::ChanAccess(const Anope::string &umask)
{
this->nc = NULL;
this->mask = umask;
- if (ircdproto->IsNickValid(this->mask))
- this->mask += "!*@*";
}
}