summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortrystan trystan@31f1291d-b8d6-0310-a050-a5561fc1590b <trystan trystan@31f1291d-b8d6-0310-a050-a5561fc1590b@5417fbe8-f217-4b02-8779-1006273d7864>2004-10-30 03:28:46 +0000
committertrystan trystan@31f1291d-b8d6-0310-a050-a5561fc1590b <trystan trystan@31f1291d-b8d6-0310-a050-a5561fc1590b@5417fbe8-f217-4b02-8779-1006273d7864>2004-10-30 03:28:46 +0000
commit3ea6c80b9b15d50026ad33938e505b9acf8e1536 (patch)
treefccd4f86fbaebb7fb6973ca12d8deb1f2cc96220
parent0038ed05f4ea53edaeabab68bafb23f908d870e4 (diff)
BUILD : 1.7.5 (431) BUGS : 193 NOTES : 1. extern normalizeBuffer() helpful in some many other places not just botserv, 2. fixed BS ACT, if the string contained a control char 001, it would cause the string to act like SAY
git-svn-id: svn://svn.anope.org/anope/trunk@431 31f1291d-b8d6-0310-a050-a5561fc1590b git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@286 5417fbe8-f217-4b02-8779-1006273d7864
-rw-r--r--Changes1
-rw-r--r--include/extern.h1
-rw-r--r--src/botserv.c6
-rw-r--r--version.log7
4 files changed, 12 insertions, 3 deletions
diff --git a/Changes b/Changes
index 2740e0ac4..320165980 100644
--- a/Changes
+++ b/Changes
@@ -33,6 +33,7 @@ Provided by Trystan <trystan@nomadirc.net> - 2004
09/07 A Ircd CHANMODE now trapped and stored. [ #00]
08/23 A New protocol independent design (aka anope-capab). [ #00]
08/28 A New IRCD document for adding new ircd support to new design. [ #00]
+10/29 F Fixed BS ACT, if the string contained control character 1 [#193]
10/27 F Fixed hardcored ircd sqlines from taking out services [#133]
10/27 F Fixed TOPIC timestamp not being read correctly [#196]
10/24 F Fixed OPNOTICE when doing /CS OP [#198]
diff --git a/include/extern.h b/include/extern.h
index 9c72ba5cc..e5702acac 100644
--- a/include/extern.h
+++ b/include/extern.h
@@ -57,6 +57,7 @@ E BotInfo *makebot(char *nick);
E BotInfo *findbot(char *nick);
E void bot_join(ChannelInfo *ci);
E void bot_rejoin_all(BotInfo *bi);
+E char *normalizeBuffer(char *);
/**** channels.c ****/
diff --git a/src/botserv.c b/src/botserv.c
index a23616521..b376ed97f 100644
--- a/src/botserv.c
+++ b/src/botserv.c
@@ -59,7 +59,7 @@ static int do_badwords(User * u);
static int do_say(User * u);
static int do_act(User * u);
void moduleAddBotServCmds(void);
-char *normalizeBuffer(char *);
+
/*************************************************************************/
/* *INDENT-OFF* */
void moduleAddBotServCmds(void) {
@@ -2434,6 +2434,7 @@ static int do_act(User * u)
char *chan = strtok(NULL, " ");
char *text = strtok(NULL, "");
+ char tmpbuf[BUFSIZE];
if (!chan || !text)
syntax_error(s_BotServ, u, "ACT", BOT_ACT_SYNTAX);
@@ -2448,7 +2449,8 @@ static int do_act(User * u)
else if (!check_access(u, ci, CA_SAY))
notice_lang(s_BotServ, u, ACCESS_DENIED);
else {
- anope_cmd_privmsg(ci->bi->nick, ci->name, "%cACTION %s%c", 1,
+ strnrepl(text, BUFSIZE, "\001", "");
+ anope_cmd_privmsg(ci->bi->nick, ci->name, "%cACTION %s %c", 1,
text, 1);
ci->bi->lastmsg = time(NULL);
if (logchan && LogBot)
diff --git a/version.log b/version.log
index fe1f9b5d1..55793bcb6 100644
--- a/version.log
+++ b/version.log
@@ -8,10 +8,15 @@
VERSION_MAJOR="1"
VERSION_MINOR="7"
VERSION_PATCH="5"
-VERSION_BUILD="430"
+VERSION_BUILD="431"
# $Log$
#
+# BUILD : 1.7.5 (431)
+# BUGS : 193
+# NOTES : 1. extern normalizeBuffer() helpful in some many other places not just botserv, 2. fixed BS ACT, if the string
+# contained a control char 001, it would cause the string to act like SAY
+#
# BUILD : 1.7.5 (430)
# BUGS : 187, 201, 202
# NOTES : Reorder fixes, Obsecure password for chanserv registeration (DrStein), minor tweak to hybrid support (TSL)