BUILD : 1.7.6 (514) BUGS : 261 NOTES : Modules can no longer call addCommand directly. The mod_name of the command MUST be set if it is a module.

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


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

5 files changed, 26 insertions, 17 deletions

diff --git a/Changes b/Changes
index 1f5c446d6..95d4518ba 100644
--- a/Changes
+++ b/Changes
@@ -1,7 +1,7 @@
 Anope Version S V N
 -------------------
 Provided by Anope Dev. <dev@anope.org> - 2004
-12/30 A Warnings for NULL values with sstrdup/moduleData.                 [ #00]
+12/30 A Warnings for NULL values with sstrdup/moduleData.                 [#261]
 12/26 A Services can enforce SGLINE and SQLINE by killing the user on set [#245]
 12/25 A Flag to tell if we need to enforce SGlines or not                 [ #00]
 12/02 A Support for other Ulines Servers (NeoStats/SolarStats).           [ #00]
@@ -16,7 +16,8 @@ Provided by Anope Dev. <dev@anope.org> - 2004
 11/19 A Added anope_cmd_ctcp() to code API, for sending CTCP messages.	  [ #00]
 11/18 A Unable to use registered nicknames as bot nicks from now on.      [ #00]
 11/18 A NSAddAccessOnReg to control access list on registration.          [ #00]
-12/30 F Catserv now uses moduleAddCommand instead of addCommand.          [ #00]
+12/30 F Modules can no longer add commands with mod_name set.             [#261]
+12/30 F Catserv now uses moduleAddCommand instead of addCommand.          [#261]
 12/27 F Not freeing memory when a channel got deleted.                    [ #00]
 12/27 F Segfaults with enforcing KillonSGline/KillonSQline.               [#260]
 12/26 F Updated IRCD doc to show all the flags currently in the code.     [ #00]
diff --git a/include/modules.h b/include/modules.h
index 500d5e025..c05d86151 100644
--- a/include/modules.h
+++ b/include/modules.h
@@ -38,19 +38,20 @@
 /**********************************************************************
  * Module Returns
  **********************************************************************/
- #define MOD_ERR_OK		0
- #define MOD_ERR_MEMORY		1
- #define MOD_ERR_PARAMS		2
- #define MOD_ERR_EXISTS		3
- #define MOD_ERR_NOEXIST	4
- #define MOD_ERR_NOUSER		5
- #define MOD_ERR_NOLOAD         6
- #define MOD_ERR_NOUNLOAD       7
- #define MOD_ERR_SYNTAX		8
- #define MOD_ERR_NODELETE	9
- #define MOD_ERR_UNKNOWN	10
- #define MOD_ERR_FILE_IO        11
- #define MOD_ERR_NOSERVICE 12
+ #define MOD_ERR_OK          0
+ #define MOD_ERR_MEMORY      1
+ #define MOD_ERR_PARAMS      2
+ #define MOD_ERR_EXISTS      3
+ #define MOD_ERR_NOEXIST     4
+ #define MOD_ERR_NOUSER      5
+ #define MOD_ERR_NOLOAD      6
+ #define MOD_ERR_NOUNLOAD    7
+ #define MOD_ERR_SYNTAX      8
+ #define MOD_ERR_NODELETE    9
+ #define MOD_ERR_UNKNOWN     10
+ #define MOD_ERR_FILE_IO     11
+ #define MOD_ERR_NOSERVICE   12
+ #define MOD_ERR_NO_MOD_NAME 13
 
  /*************************************************************************/
 
diff --git a/src/modules.c b/src/modules.c
index 83913870f..64304e4af 100644
--- a/src/modules.c
+++ b/src/modules.c
@@ -890,6 +890,9 @@ int addCommand(CommandHash * cmdTable[], Command * c, int pos)
     if (!cmdTable || !c || (pos < 0 || pos > 2)) {
         return MOD_ERR_PARAMS;
     }
+    
+    if (mod_current_module_name && !c->mod_name)
+        return MOD_ERR_NO_MOD_NAME;
 
     index = CMD_HASH(c->name);
 
diff --git a/src/modules/ircd_catserv.c b/src/modules/ircd_catserv.c
index 89118e279..c6f5e5b7b 100644
--- a/src/modules/ircd_catserv.c
+++ b/src/modules/ircd_catserv.c
@@ -9,7 +9,7 @@
 #include "module.h"
 
 #define AUTHOR "Anope"
-#define VERSION "1.1"
+#define VERSION "1.2"
 
 int my_privmsg(char *source, int ac, char **av);
 CommandHash *Catserv_cmdTable[MAX_CMD_HASH];
diff --git a/version.log b/version.log
index 7bb19410a..f3ecdf5f9 100644
--- a/version.log
+++ b/version.log
@@ -8,10 +8,14 @@
 VERSION_MAJOR="1"
 VERSION_MINOR="7"
 VERSION_PATCH="6"
-VERSION_BUILD="513"
+VERSION_BUILD="514"
 
 # $Log$
 #
+# BUILD : 1.7.6 (514)
+# BUGS  : 261
+# NOTES : Modules can no longer call addCommand directly. The mod_name of the command MUST be set if it is a module.
+#
 # BUILD : 1.7.6 (513)
 # BUGS  : 
 # NOTES : Added warnings for NULL-args with sstrdup, and NULL modname with module*Data functions. Fixed Catserv to use moduleAddCommand instead of addCommand.