summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Changes1
-rw-r--r--src/core/bs_badwords.c4
-rw-r--r--src/core/cs_akick.c5
-rw-r--r--src/ircd.c6
-rw-r--r--version.log6
5 files changed, 16 insertions, 6 deletions
diff --git a/Changes b/Changes
index 4332897d5..a3dba2a03 100644
--- a/Changes
+++ b/Changes
@@ -3,6 +3,7 @@ Anope Version S V N
08/30 A Added support for channel keys to UnrealIRCd 3.2 SVSJOIN command [#774]
08/29 A Session limit exceptions now support IP numbers as hostmask [#723]
08/29 A Added InspIRCd11 vIdent support. [#684]
+08/31 F Wrong reply when deleting entries by number (akick, badwords) [#776]
06/15 F Non-existing servers being SQUIT'd when they were juped. [#726]
06/15 F Back online notice being sent to juped servers. [#726]
06/15 F Not informing opers a SQUIT for a juped server was received. [#718]
diff --git a/src/core/bs_badwords.c b/src/core/bs_badwords.c
index 3a0828db4..acdc9ad4b 100644
--- a/src/core/bs_badwords.c
+++ b/src/core/bs_badwords.c
@@ -279,9 +279,11 @@ int badwords_del_callback(User * u, int num, va_list args)
BadWord *bw;
ChannelInfo *ci = va_arg(args, ChannelInfo *);
int *last = va_arg(args, int *);
+
+ *last = num;
+
if (num < 1 || num > ci->bwcount)
return 0;
- *last = num;
bw = &ci->badwords[num - 1];
if (bw->word)
diff --git a/src/core/cs_akick.c b/src/core/cs_akick.c
index 773388b8a..4108f58e3 100644
--- a/src/core/cs_akick.c
+++ b/src/core/cs_akick.c
@@ -94,9 +94,12 @@ int akick_del_callback(User * u, int num, va_list args)
{
ChannelInfo *ci = va_arg(args, ChannelInfo *);
int *last = va_arg(args, int *);
+
+ *last = num;
+
if (num < 1 || num > ci->akickcount)
return 0;
- *last = num;
+
return akick_del(u, &ci->akick[num - 1]);
}
diff --git a/src/ircd.c b/src/ircd.c
index b64c073cf..b56566de1 100644
--- a/src/ircd.c
+++ b/src/ircd.c
@@ -1012,9 +1012,9 @@ void pmodule_cmd_ctcp(void (*func) (char *source, char *dest, char *buf))
ircdproto.ircd_cmd_ctcp = func;
}
-void
-pmodule_cmd_svsjoin(void (*func)
- (char *source, char *nick, char *chan, char *param))
+void pmodule_cmd_svsjoin(void (*func)
+ (char *source, char *nick, char *chan,
+ char *param))
{
ircdproto.ircd_cmd_svsjoin = func;
}
diff --git a/version.log b/version.log
index d2c59319d..ba182199c 100644
--- a/version.log
+++ b/version.log
@@ -9,10 +9,14 @@ VERSION_MAJOR="1"
VERSION_MINOR="7"
VERSION_PATCH="19"
VERSION_EXTRA="-svn"
-VERSION_BUILD="1291"
+VERSION_BUILD="1292"
# $Log$
#
+# BUILD : 1.7.19 (1292)
+# BUGS : 776
+# NOTES : Fixed wrong reply when deleting entries by number (akick, badwords)
+#
# BUILD : 1.7.19 (1291)
# BUGS : 774
# NOTES : Unreals (3.2) SVSJOIN command now supports channel keys