summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--include/extern.h1
-rw-r--r--include/services.h2
-rw-r--r--src/ircd.c8
-rw-r--r--src/protocol/bahamut.c11
-rw-r--r--src/protocol/bahamut.h2
-rw-r--r--src/protocol/charybdis.c6
-rw-r--r--src/protocol/charybdis.h1
-rw-r--r--src/protocol/inspircd11.c5
-rwxr-xr-xsrc/protocol/inspircd11.h2
-rw-r--r--src/protocol/ratbox.c6
-rw-r--r--src/protocol/ratbox.h1
-rw-r--r--src/protocol/unreal32.c6
-rw-r--r--src/protocol/unreal32.h2
13 files changed, 14 insertions, 39 deletions
diff --git a/include/extern.h b/include/extern.h
index d4db17829..c8569d7b2 100644
--- a/include/extern.h
+++ b/include/extern.h
@@ -623,7 +623,6 @@ E void pmodule_cmd_318(void (*func) (const char *source, const char *who));
E void pmodule_cmd_242(void (*func) (const char *buf));
E void pmodule_cmd_243(void (*func) (const char *buf));
E void pmodule_cmd_211(void (*func) (const char *buf));
-E void pmodule_cmd_unszline(void (*func) (const char *mask));
E void pmodule_cmd_szline(void (*func) (const char *mask, const char *reason, const char *whom));
E void pmodule_cmd_sgline(void (*func) (const char *mask, const char *reason));
E void pmodule_cmd_unban(void (*func) (const char *name, const char *nick));
diff --git a/include/services.h b/include/services.h
index 68fc7ac29..e697f9c51 100644
--- a/include/services.h
+++ b/include/services.h
@@ -1073,7 +1073,6 @@ typedef struct ircd_proto_ {
void (*ircd_cmd_242)(const char *buf);
void (*ircd_cmd_243)(const char *buf);
void (*ircd_cmd_211)(const char *buf);
- void (*ircd_cmd_unszline)(const char *mask);
void (*ircd_cmd_szline)(const char *mask, const char *reason, const char *whom);
void (*ircd_cmd_sgline)(const char *mask, const char *reason);
void (*ircd_cmd_unban)(const char *name, const char *nick);
@@ -1358,6 +1357,7 @@ class IRCDProtoNew {
virtual void cmd_svshold(const char *) { }
virtual void cmd_release_svshold(const char *) { }
virtual void cmd_unsgline(const char *) { }
+ virtual void cmd_unszline(const char *) { }
};
/*************************************************************************/
diff --git a/src/ircd.c b/src/ircd.c
index a4edd0b18..370507d5b 100644
--- a/src/ircd.c
+++ b/src/ircd.c
@@ -63,7 +63,6 @@ void initIrcdProto()
ircdproto.ircd_cmd_242 = NULL;
ircdproto.ircd_cmd_243 = NULL;
ircdproto.ircd_cmd_211 = NULL;
- ircdproto.ircd_cmd_unszline = NULL;
ircdproto.ircd_cmd_szline = NULL;
ircdproto.ircd_cmd_sgline = NULL;
ircdproto.ircd_cmd_unban = NULL;
@@ -509,7 +508,7 @@ void anope_cmd_unsgline(const char *mask)
void anope_cmd_unszline(const char *mask)
{
- ircdproto.ircd_cmd_unszline(mask);
+ ircdprotonew->cmd_unszline(mask);
}
void anope_cmd_szline(const char *mask, const char *reason, const char *whom)
@@ -702,11 +701,6 @@ void pmodule_cmd_211(void (*func) (const char *buf))
ircdproto.ircd_cmd_211 = func;
}
-void pmodule_cmd_unszline(void (*func) (const char *mask))
-{
- ircdproto.ircd_cmd_unszline = func;
-}
-
void
pmodule_cmd_szline(void (*func) (const char *mask, const char *reason, const char *whom))
{
diff --git a/src/protocol/bahamut.c b/src/protocol/bahamut.c
index d5cd4c0b8..b0cf99c14 100644
--- a/src/protocol/bahamut.c
+++ b/src/protocol/bahamut.c
@@ -699,12 +699,12 @@ void BahamutIRCdProto::cmd_unsgline(const char *mask)
}
/* UNSZLINE */
-void bahamut_cmd_unszline(const char *mask)
+void BahamutIRCdProto::cmd_unszline(const char *mask)
{
- /* this will likely fail so its only here for legacy */
- send_cmd(NULL, "UNSZLINE 0 %s", mask);
- /* this is how we are supposed to deal with it */
- send_cmd(NULL, "RAKILL %s *", mask);
+ /* this will likely fail so its only here for legacy */
+ send_cmd(NULL, "UNSZLINE 0 %s", mask);
+ /* this is how we are supposed to deal with it */
+ send_cmd(NULL, "RAKILL %s *", mask);
}
/* SZLINE */
@@ -1396,7 +1396,6 @@ void moduleAddAnopeCmds()
pmodule_cmd_242(bahamut_cmd_242);
pmodule_cmd_243(bahamut_cmd_243);
pmodule_cmd_211(bahamut_cmd_211);
- pmodule_cmd_unszline(bahamut_cmd_unszline);
pmodule_cmd_szline(bahamut_cmd_szline);
pmodule_cmd_sgline(bahamut_cmd_sgline);
pmodule_cmd_unban(bahamut_cmd_unban);
diff --git a/src/protocol/bahamut.h b/src/protocol/bahamut.h
index 595aefcd1..752c1b8f6 100644
--- a/src/protocol/bahamut.h
+++ b/src/protocol/bahamut.h
@@ -76,7 +76,6 @@ void bahamut_cmd_318(const char *source, const char *who);
void bahamut_cmd_242(const char *buf);
void bahamut_cmd_243(const char *buf);
void bahamut_cmd_211(const char *buf);
-void bahamut_cmd_unszline(const char *mask);
void bahamut_cmd_szline(const char *mask, const char *reason, const char *whom);
void bahamut_cmd_sgline(const char *mask, const char *reason);
void bahamut_cmd_unban(const char *name, const char *nick);
@@ -113,4 +112,5 @@ class BahamutIRCdProto : public IRCDProtoNew {
void cmd_svshold(const char *);
void cmd_release_svshold(const char *);
void cmd_unsgline(const char *);
+ void cmd_unszline(const char *);
} ircd_proto;
diff --git a/src/protocol/charybdis.c b/src/protocol/charybdis.c
index 3ded27fbb..06c46590f 100644
--- a/src/protocol/charybdis.c
+++ b/src/protocol/charybdis.c
@@ -758,11 +758,6 @@ void CharybdisProto::cmd_unsgline(const char *mask)
send_cmd(UseTS6 ? (ud ? ud->uid : s_OperServ) : s_OperServ, "UNXLINE * %s", mask);
}
-void charybdis_cmd_unszline(const char *mask)
-{
- /* not supported */
-}
-
void charybdis_cmd_szline(const char *mask, const char *reason, const char *whom)
{
/* not supported */
@@ -1667,7 +1662,6 @@ void moduleAddAnopeCmds()
pmodule_cmd_242(charybdis_cmd_242);
pmodule_cmd_243(charybdis_cmd_243);
pmodule_cmd_211(charybdis_cmd_211);
- pmodule_cmd_unszline(charybdis_cmd_unszline);
pmodule_cmd_szline(charybdis_cmd_szline);
pmodule_cmd_sgline(charybdis_cmd_sgline);
pmodule_cmd_unban(charybdis_cmd_unban);
diff --git a/src/protocol/charybdis.h b/src/protocol/charybdis.h
index 3574713e1..6185d3443 100644
--- a/src/protocol/charybdis.h
+++ b/src/protocol/charybdis.h
@@ -64,7 +64,6 @@ void charybdis_cmd_318(const char *source, const char *who);
void charybdis_cmd_242(const char *buf);
void charybdis_cmd_243(const char *buf);
void charybdis_cmd_211(const char *buf);
-void charybdis_cmd_unszline(const char *mask);
void charybdis_cmd_szline(const char *mask, const char *reason, const char *whom);
void charybdis_cmd_sgline(const char *mask, const char *reason);
void charybdis_cmd_unban(const char *name, const char *nick);
diff --git a/src/protocol/inspircd11.c b/src/protocol/inspircd11.c
index 2dcb99588..94144afd4 100644
--- a/src/protocol/inspircd11.c
+++ b/src/protocol/inspircd11.c
@@ -1468,9 +1468,9 @@ void InspIRCdProto::cmd_release_svshold(const char *nick)
}
/* UNSZLINE */
-void inspircd_cmd_unszline(const char *mask)
+void InspIRCdProto::cmd_unszline(const char *mask)
{
- send_cmd(s_OperServ, "ZLINE %s", mask);
+ send_cmd(s_OperServ, "ZLINE %s", mask);
}
/* SZLINE */
@@ -1641,7 +1641,6 @@ void moduleAddAnopeCmds()
pmodule_cmd_242(inspircd_cmd_242);
pmodule_cmd_243(inspircd_cmd_243);
pmodule_cmd_211(inspircd_cmd_211);
- pmodule_cmd_unszline(inspircd_cmd_unszline);
pmodule_cmd_szline(inspircd_cmd_szline);
pmodule_cmd_sgline(inspircd_cmd_sgline);
pmodule_cmd_unban(inspircd_cmd_unban);
diff --git a/src/protocol/inspircd11.h b/src/protocol/inspircd11.h
index b4e21c3a8..1f6f34a0f 100755
--- a/src/protocol/inspircd11.h
+++ b/src/protocol/inspircd11.h
@@ -69,7 +69,6 @@ void inspircd_cmd_318(const char *source, const char *who);
void inspircd_cmd_242(const char *buf);
void inspircd_cmd_243(const char *buf);
void inspircd_cmd_211(const char *buf);
-void inspircd_cmd_unszline(const char *mask);
void inspircd_cmd_szline(const char *mask, const char *reason, const char *whom);
void inspircd_cmd_sgline(const char *mask, const char *reason);
void inspircd_cmd_unban(const char *name, const char *nick);
@@ -118,4 +117,5 @@ class InspIRCdProto : public IRCDProtoNew {
void cmd_connect();
void cmd_svshold(const char *);
void cmd_release_svshold(const char *);
+ void cmd_unszline(const char *);
} ircd_proto;
diff --git a/src/protocol/ratbox.c b/src/protocol/ratbox.c
index e048c583f..184844a61 100644
--- a/src/protocol/ratbox.c
+++ b/src/protocol/ratbox.c
@@ -705,11 +705,6 @@ void RatboxProto::cmd_unsgline(const char *mask)
send_cmd(UseTS6 ? (ud ? ud->uid : s_OperServ) : s_OperServ, "UNXLINE * %s", mask);
}
-void ratbox_cmd_unszline(const char *mask)
-{
- /* Does not support */
-}
-
void ratbox_cmd_szline(const char *mask, const char *reason, const char *whom)
{
/* Does not support */
@@ -1545,7 +1540,6 @@ void moduleAddAnopeCmds()
pmodule_cmd_242(ratbox_cmd_242);
pmodule_cmd_243(ratbox_cmd_243);
pmodule_cmd_211(ratbox_cmd_211);
- pmodule_cmd_unszline(ratbox_cmd_unszline);
pmodule_cmd_szline(ratbox_cmd_szline);
pmodule_cmd_sgline(ratbox_cmd_sgline);
pmodule_cmd_unban(ratbox_cmd_unban);
diff --git a/src/protocol/ratbox.h b/src/protocol/ratbox.h
index ecf2e3bd0..7fa42360e 100644
--- a/src/protocol/ratbox.h
+++ b/src/protocol/ratbox.h
@@ -63,7 +63,6 @@ void ratbox_cmd_318(const char *source, const char *who);
void ratbox_cmd_242(const char *buf);
void ratbox_cmd_243(const char *buf);
void ratbox_cmd_211(const char *buf);
-void ratbox_cmd_unszline(const char *mask);
void ratbox_cmd_szline(const char *mask, const char *reason, const char *whom);
void ratbox_cmd_sgline(const char *mask, const char *reason);
void ratbox_cmd_unban(const char *name, const char *nick);
diff --git a/src/protocol/unreal32.c b/src/protocol/unreal32.c
index e761f39de..2e833f288 100644
--- a/src/protocol/unreal32.c
+++ b/src/protocol/unreal32.c
@@ -1360,10 +1360,9 @@ void UnrealIRCdProto::cmd_unsgline(const char *mask)
}
/* UNSZLINE */
-void unreal_cmd_unszline(const char *mask)
+void UnrealIRCdProto::cmd_unszline(const char *mask)
{
- send_cmd(NULL, "%s - Z * %s %s", send_token("TKL", "BD"), mask,
- s_OperServ);
+ send_cmd(NULL, "%s - Z * %s %s", send_token("TKL", "BD"), mask, s_OperServ);
}
/* SZLINE */
@@ -1938,7 +1937,6 @@ void moduleAddAnopeCmds()
pmodule_cmd_242(unreal_cmd_242);
pmodule_cmd_243(unreal_cmd_243);
pmodule_cmd_211(unreal_cmd_211);
- pmodule_cmd_unszline(unreal_cmd_unszline);
pmodule_cmd_szline(unreal_cmd_szline);
pmodule_cmd_sgline(unreal_cmd_sgline);
pmodule_cmd_unban(unreal_cmd_unban);
diff --git a/src/protocol/unreal32.h b/src/protocol/unreal32.h
index 20127694a..e19c29611 100644
--- a/src/protocol/unreal32.h
+++ b/src/protocol/unreal32.h
@@ -98,7 +98,6 @@ void unreal_cmd_318(const char *source, const char *who);
void unreal_cmd_242(const char *buf);
void unreal_cmd_243(const char *buf);
void unreal_cmd_211(const char *buf);
-void unreal_cmd_unszline(const char *mask);
void unreal_cmd_szline(const char *mask, const char *reason, const char *whom);
void unreal_cmd_sgline(const char *mask, const char *reason);
void unreal_cmd_unban(const char *name, const char *nick);
@@ -139,4 +138,5 @@ class UnrealIRCdProto : public IRCDProtoNew {
void cmd_svshold(const char *);
void cmd_release_svshold(const char *);
void cmd_unsgline(const char *);
+ void cmd_unszline(const char *);
} ircd_proto;