BUILD : 1.7.13 (1002) BUGS : 440 NOTES : Made bs_init and hostserv_init useless when BotServ/HostServ are disabled; fixed compile errors/warnings introduced by Certus

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


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

6 files changed, 23 insertions, 14 deletions

diff --git a/Changes b/Changes
index ef8742c51..84c7a29e2 100644
--- a/Changes
+++ b/Changes
@@ -3,6 +3,7 @@ Anope Version  S V N
 Provided by Anope Dev. <dev@anope.org> - 2006
 02/04 A Events for channel kicks and NickServ logout.                     [ #00]
 03/02 A Added support for TS6 Save (FNC) on ratbox, shadow and charybdis. [#424]
+03/02 F BotServ/HostServ are no longer loaded when they are disabled.     [#440]
 03/01 F Added ircd module support for valid_chan.                         [ #00]
 03/01 F Minor issues in ns_saset.                                         [#455]
 02/13 F Yet anotehr 64bit issue.                                          [ #00]
diff --git a/src/botserv.c b/src/botserv.c
index 39fc06d3e..0e040624d 100644
--- a/src/botserv.c
+++ b/src/botserv.c
@@ -74,10 +74,12 @@ void get_botserv_stats(long *nrec, long *memuse)
 void bs_init(void)
 {
     Command *cmd;
-    moduleAddBotServCmds();
-    cmd = findCommand(BOTSERV, "SET SYMBIOSIS");
-    if (cmd)
-        cmd->help_param1 = s_ChanServ;
+    if (s_BotServ) {
+        moduleAddBotServCmds();
+        cmd = findCommand(BOTSERV, "SET SYMBIOSIS");
+        if (cmd)
+            cmd->help_param1 = s_ChanServ;
+    }
 }
 
 /*************************************************************************/
diff --git a/src/channels.c b/src/channels.c
index 8191eccd3..1289c3af8 100644
--- a/src/channels.c
+++ b/src/channels.c
@@ -1170,11 +1170,11 @@ void do_cmode(const char *source, int ac, char **av)
                      merge_args(ac - 1, av + 1), av[0]);
             }
         if (tofree0)
-            free(av[0];
+            free(av[0]);
         if (tofree1)
-            free(av[1];
+            free(av[1]);
         if (tofree2)
-            free(av[2];
+            free(av[2]);
         return;
     }
 
@@ -1190,12 +1190,12 @@ void do_cmode(const char *source, int ac, char **av)
     ac--;
     av++;
     chan_set_modes(source, chan, ac, av, 1);
+    if (tofree0)
+        free(av[0]);
     if (tofree1)
-        free(av[0];
+        free(av[1]);
     if (tofree2)
-        free(av[1];
-    if (tofree3)
-        free(av[2];
+        free(av[2]);
 }
 
 /*************************************************************************/
diff --git a/src/hostserv.c b/src/hostserv.c
index 3fde7ba3a..a338c660c 100644
--- a/src/hostserv.c
+++ b/src/hostserv.c
@@ -56,8 +56,9 @@ void moduleAddHostServCmds(void)
  */
 void hostserv_init(void)
 {
-    moduleAddHostServCmds();
-
+    if (s_HostServ) {
+        moduleAddHostServCmds();
+    }
 }
 
 /*************************************************************************/
diff --git a/src/protocol/ratbox.c b/src/protocol/ratbox.c
index 9fbe537cc..a6e154bea 100644
--- a/src/protocol/ratbox.c
+++ b/src/protocol/ratbox.c
@@ -1730,6 +1730,7 @@ int ratbox_valid_nick(char *nick)
     /* TS6 Save extension -Certus */
     if (isdigit(*nick))
         return 0;
+	return 1;
 }
 
 /* 
diff --git a/version.log b/version.log
index 3e3150179..d2ba56dcf 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="1001"
+VERSION_BUILD="1002"
 
 # $Log$
 #
+# BUILD : 1.7.13 (1002)
+# BUGS  : 440
+# NOTES : Made bs_init and hostserv_init useless when BotServ/HostServ are disabled; fixed compile errors/warnings introduced by Certus
+#
 # BUILD : 1.7.13 (1001)
 # BUGS  : 
 # NOTES : NickServ will now check anope_valid_nick()