summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Changes1
-rw-r--r--src/botserv.c14
-rw-r--r--version.log6
3 files changed, 16 insertions, 5 deletions
diff --git a/Changes b/Changes
index 984aa17d1..ef8659063 100644
--- a/Changes
+++ b/Changes
@@ -3,6 +3,7 @@ Anope Version S V N
Provided by Anope Dev. <dev@anope.org> - 2004
11/18 A Unable to use registered nicknames as bot nicks from now on. [ #00]
11/18 A NSAddAccessOnReg to control access list on registration. [ #00]
+11/19 F Wrong string and missing registered nick check in bot change. [#221]
Provided by Trystan <trystan@nomadirc.net> - 2004
11/16 F NickTracking could allow usage of forbidden nick in some cases. [ #00]
diff --git a/src/botserv.c b/src/botserv.c
index 0faa9749a..e0cd346ba 100644
--- a/src/botserv.c
+++ b/src/botserv.c
@@ -1262,7 +1262,7 @@ static int do_bot(User * u)
* it as a bot nick from now on -GD
*/
if ((na = findnick(nick))) {
- notice_lang(s_BotServ, u, NICK_X_IN_USE, nick);
+ notice_lang(s_BotServ, u, NICK_ALREADY_REGISTERED, nick);
return MOD_CONT;
}
@@ -1368,9 +1368,15 @@ static int do_bot(User * u)
anope_cmd_unsqline(bi->nick);
}
- /* We check whether the nick is registered, and drop it if so */
- if ((na = findnick(nick)))
- delnick(na);
+ /* We check whether the nick is registered, and inform the user
+ * if so. You need to drop the nick manually before you can use
+ * it as a bot nick from now on -GD
+ */
+ if ((na = findnick(nick))) {
+ notice_lang(s_BotServ, u, NICK_ALREADY_REGISTERED,
+ nick);
+ return MOD_CONT;
+ }
/* We check whether user with this nick is online, and kill it if so */
EnforceQlinedNick(nick, s_BotServ);
diff --git a/version.log b/version.log
index 7d87c235c..5af81071b 100644
--- a/version.log
+++ b/version.log
@@ -8,10 +8,14 @@
VERSION_MAJOR="1"
VERSION_MINOR="7"
VERSION_PATCH="6"
-VERSION_BUILD="450"
+VERSION_BUILD="451"
# $Log$
#
+# BUILD : 1.7.6 (451)
+# BUGS : 221
+# NOTES : Fixes for wrong string for bot nick registration check, and added the check to bot change
+#
# BUILD : 1.7.6 (450)
# BUGS :
# NOTES : Updated en_us.l for new BotServ BOT ADD behaviour