summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--include/extern.h1
-rw-r--r--include/services.h2
-rw-r--r--src/ircd.c5
-rw-r--r--src/nickserv.c2
-rw-r--r--src/protocol/bahamut.c2
-rw-r--r--src/protocol/bahamut.h2
-rw-r--r--src/protocol/charybdis.c2
-rw-r--r--src/protocol/charybdis.h2
-rw-r--r--src/protocol/inspircd11.c2
-rwxr-xr-xsrc/protocol/inspircd11.h2
-rw-r--r--src/protocol/unreal32.c2
-rw-r--r--src/protocol/unreal32.h2
12 files changed, 10 insertions, 16 deletions
diff --git a/include/extern.h b/include/extern.h
index 4d51988ac..d1e35de29 100644
--- a/include/extern.h
+++ b/include/extern.h
@@ -1125,7 +1125,6 @@ E void anope_SendSGLine(const char *mask, const char *reason); /* SGL
E void anope_SendSZLine(const char *mask, const char *reason, const char *whom); /* SZLINE */
E void anope_cmd_svinfo(); /* SVINFO */
E void anope_cmd_svsadmin(const char *server, int set); /* SVSADMIN */
-E void anope_SendSVSHOLD(const char *nick); /* SVSHOLD */
E void anope_SendSVSHOLDDel(const char *nick); /* SVSHOLD */
E void anope_cmd_svsinfo(); /* SVSINFO */
E void anope_SendSVSJoin(const char *source, const char *nick,const char *chan, const char *param); /* SVSJOIN */
diff --git a/include/services.h b/include/services.h
index 4ca5b935a..9b4fdf488 100644
--- a/include/services.h
+++ b/include/services.h
@@ -1445,7 +1445,7 @@ class IRCDProto {
}
virtual void SendVhost(const char *, const char *, const char *) { }
virtual void SendConnect() = 0;
- virtual void SendSVSHOLD(const char *) { }
+ virtual void SendSVSHold(const char *) { }
virtual void SendSVSHOLDDel(const char *) { }
virtual void SendSGLineDel(const char *) { }
virtual void SendSZLineDel(const char *) { }
diff --git a/src/ircd.c b/src/ircd.c
index 81eea249e..357d7753f 100644
--- a/src/ircd.c
+++ b/src/ircd.c
@@ -43,11 +43,6 @@ void anope_ProcessUsermodes(User *user, int ac, const char **av)
ircdproto->ProcessUsermodes(user, ac, av);
}
-void anope_SendSVSHOLD(const char *nick)
-{
- ircdproto->SendSVSHOLD(nick);
-}
-
void anope_SendSVSHOLDDel(const char *nick)
{
ircdproto->SendSVSHOLDDel(nick);
diff --git a/src/nickserv.c b/src/nickserv.c
index 2416af4e4..f12b8915d 100644
--- a/src/nickserv.c
+++ b/src/nickserv.c
@@ -954,7 +954,7 @@ void cancel_user(User * u)
if (na->status & NS_GUESTED) {
if (ircd->svshold) {
if (UseSVSHOLD) {
- anope_SendSVSHOLD(na->nick);
+ ircdproto->SendSVSHold(na->nick);
} else {
if (ircd->svsnick) {
ircdproto->SendGuestNick(u->nick, NSEnforcerUser,
diff --git a/src/protocol/bahamut.c b/src/protocol/bahamut.c
index 298b0f987..96c0855fa 100644
--- a/src/protocol/bahamut.c
+++ b/src/protocol/bahamut.c
@@ -460,7 +460,7 @@ void BahamutIRCdProto::SendModeInternal(const char *source, const char *dest, co
}
/* SVSHOLD - set */
-void BahamutIRCdProto::SendSVSHOLD(const char *nick)
+void BahamutIRCdProto::SendSVSHold(const char *nick)
{
send_cmd(ServerName, "SVSHOLD %s %d :%s", nick, NSReleaseTimeout, "Being held for registered user");
}
diff --git a/src/protocol/bahamut.h b/src/protocol/bahamut.h
index 59687bfcd..691da0034 100644
--- a/src/protocol/bahamut.h
+++ b/src/protocol/bahamut.h
@@ -76,7 +76,7 @@ class BahamutIRCdProto : public IRCDProto {
void SendSQLineDel(const char *);
void SendSQLine(const char *, const char *);
void SendConnect();
- void SendSVSHOLD(const char *);
+ void SendSVSHold(const char *);
void SendSVSHOLDDel(const char *);
void SendSGLineDel(const char *);
void SendSZLineDel(const char *);
diff --git a/src/protocol/charybdis.c b/src/protocol/charybdis.c
index e867921d6..3bcf2287f 100644
--- a/src/protocol/charybdis.c
+++ b/src/protocol/charybdis.c
@@ -1126,7 +1126,7 @@ int anope_event_capab(const char *source, int ac, const char **av)
}
/* SVSHOLD - set */
-void CharybdisProto::SendSVSHOLD(const char *nick)
+void CharybdisProto::SendSVSHold(const char *nick)
{
send_cmd(NULL, "ENCAP * NICKDELAY 300 %s", nick);
}
diff --git a/src/protocol/charybdis.h b/src/protocol/charybdis.h
index 085c1f0d6..0f473a671 100644
--- a/src/protocol/charybdis.h
+++ b/src/protocol/charybdis.h
@@ -69,7 +69,7 @@ class CharybdisProto : public IRCDTS6Proto {
void SendForceNickChange(const char *, const char *, time_t);
void SendVhost(const char *, const char *, const char *);
void SendConnect();
- void SendSVSHOLD(const char *);
+ void SendSVSHold(const char *);
void SendSVSHOLDDel(const char *);
void SendSGLineDel(const char *);
void SendSGLine(const char *, const char *);
diff --git a/src/protocol/inspircd11.c b/src/protocol/inspircd11.c
index 638dce58c..3a2169379 100644
--- a/src/protocol/inspircd11.c
+++ b/src/protocol/inspircd11.c
@@ -1268,7 +1268,7 @@ int anope_event_capab(const char *source, int ac, const char **av)
}
/* SVSHOLD - set */
-void InspIRCdProto::SendSVSHOLD(const char *nick)
+void InspIRCdProto::SendSVSHold(const char *nick)
{
send_cmd(s_OperServ, "SVSHOLD %s %ds :%s", nick, NSReleaseTimeout, "Being held for registered user");
}
diff --git a/src/protocol/inspircd11.h b/src/protocol/inspircd11.h
index ddf679a2d..13bd640df 100755
--- a/src/protocol/inspircd11.h
+++ b/src/protocol/inspircd11.h
@@ -71,7 +71,7 @@ class InspIRCdProto : public IRCDProto {
void SendSquit(const char *, const char *);
void SendVhost(const char *, const char *, const char *);
void SendConnect();
- void SendSVSHOLD(const char *);
+ void SendSVSHold(const char *);
void SendSVSHOLDDel(const char *);
void SendSZLineDel(const char *);
void SendSZLine(const char *, const char *, const char *);
diff --git a/src/protocol/unreal32.c b/src/protocol/unreal32.c
index ada8e72c5..72459e94b 100644
--- a/src/protocol/unreal32.c
+++ b/src/protocol/unreal32.c
@@ -1117,7 +1117,7 @@ int anope_event_whois(const char *source, int ac, const char **av)
}
/* SVSHOLD - set */
-void UnrealIRCdProto::SendSVSHOLD(const char *nick)
+void UnrealIRCdProto::SendSVSHold(const char *nick)
{
send_cmd(NULL, "%s + Q H %s %s %ld %ld :%s", send_token("TKL", "BD"), nick, ServerName, static_cast<long>(time(NULL) + NSReleaseTimeout),
static_cast<long>(time(NULL)), "Being held for registered user");
diff --git a/src/protocol/unreal32.h b/src/protocol/unreal32.h
index 27d161d0c..6c2fa7e5b 100644
--- a/src/protocol/unreal32.h
+++ b/src/protocol/unreal32.h
@@ -102,7 +102,7 @@ class UnrealIRCdProto : public IRCDProto {
void SendChangeBotNick(const char *, const char *);
void SendVhost(const char *, const char *, const char *);
void SendConnect();
- void SendSVSHOLD(const char *);
+ void SendSVSHold(const char *);
void SendSVSHOLDDel(const char *);
void SendSGLineDel(const char *);
void SendSZLineDel(const char *);