summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorgeniusdex geniusdex@31f1291d-b8d6-0310-a050-a5561fc1590b <geniusdex geniusdex@31f1291d-b8d6-0310-a050-a5561fc1590b@5417fbe8-f217-4b02-8779-1006273d7864>2004-11-18 16:33:37 +0000
committergeniusdex geniusdex@31f1291d-b8d6-0310-a050-a5561fc1590b <geniusdex geniusdex@31f1291d-b8d6-0310-a050-a5561fc1590b@5417fbe8-f217-4b02-8779-1006273d7864>2004-11-18 16:33:37 +0000
commite5e98cc9e55706dfe2eaffde57abda48ec5c1b6a (patch)
tree0f36aac3fc4ded0ab7905b36888a9906d3164bae
parentfd63b1d276d1cdab708c1eda6aa25ba1281b3ff9 (diff)
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
-rw-r--r--Changes1
-rw-r--r--src/botserv.c13
-rw-r--r--version.log6
3 files changed, 12 insertions, 8 deletions
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. <dev@anope.org> - 2004
+11/18 A Unable to use registered nicknames as bot nicks from now on. [ #00]
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 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