BUILD : 1.7.13 (977) BUGS : 461 463 NOTES : happy bug-fixing-day to all of you.

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


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

6 files changed, 20 insertions, 6 deletions

diff --git a/Changes b/Changes
index 4d951dcaa..7efe66f2a 100644
--- a/Changes
+++ b/Changes
@@ -8,6 +8,8 @@ Provided by Anope Dev. <dev@anope.org> - 2006
 02/11 F Fixed a few memleaks.                                             [#420]
 02/17 F cs_getpass will now unload if encryption is enaled.               [ #00]
 02/19 F Fixed position of EVENT_ACCESS_DEL.                               [ #00]
+03/01 F Fixed ident check on /bs bot change.                              [#463]
+03/01 F Fixed # prefix check on /cs forbid.                               [#461]
 
 Provided by nenolod. <nenolod@nenolod.net> - 2006
 02/03 A Support for Charybdis IRCd.                                       [ #00]
diff --git a/docs/EVENTS b/docs/EVENTS
index a50366515..878ec5545 100644
--- a/docs/EVENTS
+++ b/docs/EVENTS
@@ -167,8 +167,9 @@ Anope Internal Events
         An user has been deleted of a channel access list.
         av[0]  Name of the channel the access entry has been deleted which.
         av[1]  The nickname of the user that has just deleted the access entry.
-        av[2]  The nickname of the user wich his access level has just been
-               removed.
+        av[2]  [OPTIONAL] The nickname of the user wich his access level has just
+               been removed. Not present if numbers were used (e.g. /cs access
+               del 7).
 
     EVENT_BOT_ASSIGN
         A BotServ bot has been assigned to a channel.
diff --git a/src/core/bs_bot.c b/src/core/bs_bot.c
index e2c845ea2..eaf66b9c8 100644
--- a/src/core/bs_bot.c
+++ b/src/core/bs_bot.c
@@ -197,6 +197,8 @@ int do_bot(User * u)
             notice_lang(s_BotServ, u, BOT_DOES_NOT_EXIST, oldnick);
         else if (strlen(nick) > NickLen)
             notice_lang(s_BotServ, u, BOT_BAD_NICK);
+        else if (strlen(user) >= USERMAX)
+            notice_lang(s_BotServ, u, BOT_BAD_IDENT);
         else {
             NickAlias *na;
 
diff --git a/src/core/cs_access.c b/src/core/cs_access.c
index cf09573c5..f3858b44f 100644
--- a/src/core/cs_access.c
+++ b/src/core/cs_access.c
@@ -136,9 +136,6 @@ static int access_list_callback(User * u, int num, va_list args)
  * The /cs access command.
  * @param u The user who issued the command
  * @param MOD_CONT to continue processing other modules, MOD_STOP to stop processing.
- *
- * Known bug: EVENT_ACCESS_DEL won't be triggered if you use numbers instead of nicks.
- * -Certus
  **/
 int do_access(User * u)
 {
@@ -346,8 +343,12 @@ int do_access(User * u)
                     }
                 }
             }
+            /* We don't know the nick if someone used numbers, so we trigger the event without
+             * nick param. We just do this once, even if someone enters a range. -Certus */
             if (na)
                 send_event(EVENT_ACCESS_DEL, 3, ci->name, u->nick, na->nick);
+            else
+                send_event(EVENT_ACCESS_DEL, 2, ci->name, u->nick);
         }
     } else if (stricmp(cmd, "LIST") == 0) {
         int sent_header = 0;
diff --git a/src/core/cs_forbid.c b/src/core/cs_forbid.c
index e7efd39d5..07d52f174 100644
--- a/src/core/cs_forbid.c
+++ b/src/core/cs_forbid.c
@@ -81,6 +81,10 @@ int do_forbid(User * u)
                       CHAN_FORBID_SYNTAX));
         return MOD_CONT;
     }
+    if (*chan != '#') {
+        notice_lang(s_ChanServ, u, CHAN_SYMBOL_REQUIRED);
+        return MOD_CONT;
+    }
     if (readonly)
         notice_lang(s_ChanServ, u, READ_ONLY_MODE);
     if ((ci = cs_findchan(chan)) != NULL)
diff --git a/version.log b/version.log
index b7e82b2ee..bbcd9d872 100644
--- a/version.log
+++ b/version.log
@@ -9,10 +9,14 @@ VERSION_MAJOR="1"
 VERSION_MINOR="7"
 VERSION_PATCH="13"
 VERSION_EXTRA="-svn"
-VERSION_BUILD="976"
+VERSION_BUILD="977"
 
 # $Log$
 #
+# BUILD : 1.7.13 (977)
+# BUGS  : 461 463
+# NOTES : happy bug-fixing-day to all of you.
+#
 # BUILD : 1.7.13 (976)
 # BUGS  : 396
 # NOTES : Fixed TS6 issues with handling nick changes and channel modes