BUILD : 1.7.6 (447) BUGS : NOTES : New botserv bot nicks need to be unregistered nicks from now on

git-svn-id: svn://svn.anope.org/anope/trunk@447 31f1291d-b8d6-0310-a050-a5561fc1590b


git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@301 5417fbe8-f217-4b02-8779-1006273d7864

1 files changed, 6 insertions, 7 deletions

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);