diff --git a/Changes b/Changes index acac20852..5c22115e7 100644 --- a/Changes +++ b/Changes @@ -1,6 +1,7 @@ Anope Version S V N ------------------- Provided by Anope Dev. - 2004 +11/18 A Unable to use registered nicknames as bot nicks from now on. [ #00] Provided by Trystan - 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 c903f43d0..0faa9749a 100644 --- a/src/botserv.c +++ b/src/botserv.c @@ -1257,14 +1257,13 @@ static int do_bot(User * u) return MOD_CONT; } - /* We check whether the nick is registered, and drop it if so. */ + /* 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))) { - if (NSSecureAdmins && nick_is_services_admin(na->nc) - && !is_services_root(u)) { - notice_lang(s_BotServ, u, PERMISSION_DENIED); - return MOD_CONT; - } - delnick(na); + notice_lang(s_BotServ, u, NICK_X_IN_USE, nick); + return MOD_CONT; } bi = makebot(nick); diff --git a/version.log b/version.log index 867d909db..bd3f2e449 100644 --- a/version.log +++ b/version.log @@ -8,10 +8,14 @@ VERSION_MAJOR="1" VERSION_MINOR="7" VERSION_PATCH="6" -VERSION_BUILD="446" +VERSION_BUILD="447" # $Log$ # +# BUILD : 1.7.6 (447) +# BUGS : +# NOTES : New botserv bot nicks need to be unregistered nicks from now on +# # BUILD : 1.7.6 (446) # BUGS : N/A # NOTES : 1. Added a debug message to do_kill(), 2. nsCheckNickTracking() could return true in some cases where the nick