From 09ca64b8899f8c11ee06271f04f0c3dbeb7bebe6 Mon Sep 17 00:00:00 2001 From: "dane dane@31f1291d-b8d6-0310-a050-a5561fc1590b" Date: Fri, 21 May 2004 17:23:46 +0000 Subject: BUILD : 1.7.3 (120) BUGS : 50 NOTES : Reserved nicks (Q-lined) will be KILLed if taken on induction. git-svn-id: svn://svn.anope.org/anope/trunk@120 31f1291d-b8d6-0310-a050-a5561fc1590b git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@94 5417fbe8-f217-4b02-8779-1006273d7864 --- botserv.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) (limited to 'botserv.c') diff --git a/botserv.c b/botserv.c index 3e4160f24..2c76155bf 100644 --- a/botserv.c +++ b/botserv.c @@ -1280,7 +1280,6 @@ static int do_bot(User * u) else if (findbot(nick)) notice_lang(s_BotServ, u, BOT_BOT_ALREADY_EXISTS, nick); else { - User *u2; NickAlias *na; /** @@ -1379,9 +1378,7 @@ static int do_bot(User * u) bi->chancount = 0; /* We check whether user with this nick is online, and kill it if so */ - if ((u2 = finduser(nick))) - kill_user(s_BotServ, u2->nick, - "This nick is now used by Services"); + EnforceQlinedNick(nick, s_BotServ); /* We make the bot online, ready to serve */ #if defined(IRC_UNREAL) || defined (IRC_VIAGRA) @@ -1411,7 +1408,6 @@ static int do_bot(User * u) else if (!(bi = findbot(oldnick))) notice_lang(s_BotServ, u, BOT_DOES_NOT_EXIST, oldnick); else { - User *u2; NickAlias *na; /* Checks whether there *are* changes. @@ -1511,9 +1507,7 @@ static int do_bot(User * u) delnick(na); /* We check whether user with this nick is online, and kill it if so */ - if ((u2 = finduser(nick))) - kill_user(s_BotServ, u2->nick, - "This nick is now used by Services"); + EnforceQlinedNick(nick, s_BotServ); } if (strcmp(nick, bi->nick)) -- cgit