pegasus/anope
1
0
Fork 0
mirror of https://github.com/anope/anope.git synced 2026-06-30 07:56:37 +02:00
Code Activity

Check for a valid server in /operserv noop

Browse Source
This commit is contained in:
Adam
2011-05-03 00:13:19 -04:00
parent fd21c36725
commit b59602abf8
4 changed files with 19 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/services.h
+1 -1
View File
@@ -857,7 +857,7 @@ class CoreExport IRCDProto
public:
virtual ~IRCDProto() { }
virtual void SendSVSNOOP(const Anope::string &, int) { }
virtual void SendSVSNOOP(const Server *, bool) { }
virtual void SendTopic(BotInfo *, Channel *) = 0;
virtual void SendVhostDel(User *) { }
virtual void SendAkill(User *, const XLine *) = 0;
modules/core/os_noop.cpp
+14 -13
View File
@@ -28,34 +28,37 @@ class CommandOSNOOP : public Command
const Anope::string &cmd = params[0];
const Anope::string &server = params[1];
if (cmd.equals_ci("SET"))
Server *s = Server::Find(server);
if (s == NULL)
source.Reply(_("Server %s does not exist."), server.c_str());
else if (cmd.equals_ci("SET"))
{
Anope::string reason;
/* Remove the O:lines */
ircdproto->SendSVSNOOP(server, 1);
ircdproto->SendSVSNOOP(s, true);
reason = "NOOP command used by " + u->nick;
Log(LOG_ADMIN, u, this) << "on " << server;
source.Reply(_("All O:lines of \002%s\002 have been removed."), server.c_str());
Log(LOG_ADMIN, u, this) << "SET on " << s->GetName();
source.Reply(_("All O:lines of \002%s\002 have been removed."), s->GetName().c_str());
Anope::string reason = "NOOP command used by " + u->nick;
/* Kill all the IRCops of the server */
for (Anope::insensitive_map<User *>::iterator it = UserListByNick.begin(); it != UserListByNick.end();)
{
User *u2 = it->second;
++it;
if (u2 && u2->HasMode(UMODE_OPER) && Anope::Match(u2->server->GetName(), server, true))
if (u2 && u2->HasMode(UMODE_OPER) && u2->server == s)
u2->Kill(Config->s_OperServ, reason);
}
}
else if (cmd.equals_ci("REVOKE"))
{
ircdproto->SendSVSNOOP(server, 0);
source.Reply(_("All O:lines of \002%s\002 have been reset."), server.c_str());
Log(LOG_ADMIN, u, this) << "REVOKE on " << s->GetName();
ircdproto->SendSVSNOOP(s, false);
source.Reply(_("All O:lines of \002%s\002 have been reset."), s->GetName().c_str());
}
else
this->OnSyntaxError(source, "");
return MOD_CONT;
}
@@ -69,9 +72,7 @@ class CommandOSNOOP : public Command
"prevent them from rehashing the server (because this\n"
"would just cancel the effect).\n"
"\002NOOP REVOKE\002 makes all removed O:lines available again\n"
"on the given \002server\002.\n"
"\002Note:\002 The \002server\002 is not checked at all by the\n"
"Services."));
"on the given \002server\002.\n"));
return true;
}
modules/protocol/bahamut.cpp
+2 -2
View File
@@ -131,9 +131,9 @@ class BahamutIRCdProto : public IRCDProto
}
/* SVSNOOP */
void SendSVSNOOP(const Anope::string &server, int set)
void SendSVSNOOP(const Server *server, bool set)
{
send_cmd("", "SVSNOOP %s %s", server.c_str(), set ? "+" : "-");
send_cmd("", "SVSNOOP %s %s", server->GetName().c_str(), set ? "+" : "-");
}
/* SGLINE */
modules/protocol/unreal.cpp
+2 -2
View File
@@ -91,9 +91,9 @@ void unreal_cmd_chgident(const Anope::string &nick, const Anope::string &vIdent)
class UnrealIRCdProto : public IRCDProto
{
/* SVSNOOP */
void SendSVSNOOP(const Anope::string &server, int set)
void SendSVSNOOP(const Server *server, bool set)
{
send_cmd("", "f %s %s", server.c_str(), set ? "+" : "-");
send_cmd("", "f %s %s", server->GetName().c_str(), set ? "+" : "-");
}
void SendAkillDel(const XLine *x)