BUILD : 1.7.11 (889) BUGS : NOTES : Applied patches by Trystan to: (1) Fix memleak when AddAkiller was enabled (2) Fix MySQL detection on win32 with install.vbs (3) Remove color codes from tools on win32

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


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

7 files changed, 33 insertions, 6 deletions

diff --git a/Changes b/Changes
index ab16f2d6b..205ed9610 100644
--- a/Changes
+++ b/Changes
@@ -48,6 +48,9 @@ Provided by Ricardo <ricardoltdb@gmail.com> - 2005
 05/30 F Updated Portuguese language file. And bundled modules language.   [ #00]
 
 Provided by Trystan <trystan@nomadirc.net> - 2005
+09/18 F Removed color codes for tools on win32.                           [ #00]
+09/18 F MySQL detection for win32 in install.vbs had issues.              [ #00]
+09/18 F Memleak when AddAkiller was enabled.                              [ #00]
 09/13 F Reduntant IRCD defines removed.                                   [ #00]
 09/13 F Double Makedile generation.                                       [ #00]
 09/06 F Memory for vHosts/vIdents was not (always) being freed.           [ #00]
diff --git a/install.vbs b/install.vbs
index abcb0faa7..76e5dc29e 100644
--- a/install.vbs
+++ b/install.vbs
@@ -131,7 +131,7 @@ Else
                                 WScript.Echo "(Please DO NOT include a trailing slash '\')"
                                 MySQLLibPath = Trim(WScript.StdIn.ReadLine)
                         Loop
-                ElseIf (fso.FileExists(MySQLHeadPath & "\mysql.h") = False) Then
+                If (fso.FileExists(MySQLHeadPath & "\mysql.h") = False) Then
                         Do While (fso.FileExists(MySQLHeadPath & "\mysql.h") = False)
                                 WScript.Echo "ERROR: Cannot find 'mysql.h' in " & MySQLHeadPath
                                 WScript.Echo ""
diff --git a/src/core/os_akill.c b/src/core/os_akill.c
index 97a974e7f..1e41cb95a 100644
--- a/src/core/os_akill.c
+++ b/src/core/os_akill.c
@@ -138,11 +138,15 @@ int do_akill(User * u)
             }
 
             deleted = add_akill(u, mask, u->nick, expires, reason);
-            if (deleted < 0)
+            if (deleted < 0) {
+                if (AddAkiller) {
+                    free(reason);
+                }
                 return MOD_CONT;
-            else if (deleted)
+            } else if (deleted) {
                 notice_lang(s_OperServ, u, OPER_AKILL_DELETED_SEVERAL,
                             deleted);
+            }
             notice_lang(s_OperServ, u, OPER_AKILL_ADDED, mask);
 
             if (WallOSAkill) {
@@ -175,9 +179,12 @@ int do_akill(User * u)
                                  u->nick, mask, reason, buf);
             }
 
-            if (readonly)
+            if (readonly) {
                 notice_lang(s_OperServ, u, READ_ONLY_MODE);
-
+            }
+            if (AddAkiller) {
+               free(reason);
+            }
         } else {
             syntax_error(s_OperServ, u, "AKILL", OPER_AKILL_SYNTAX);
         }
diff --git a/src/core/os_chankill.c b/src/core/os_chankill.c
index c391390e0..9a7bb19af 100644
--- a/src/core/os_chankill.c
+++ b/src/core/os_chankill.c
@@ -123,6 +123,9 @@ int do_chankill(User * u)
         } else {
             notice_lang(s_OperServ, u, CHAN_X_NOT_IN_USE, channel);
         }
+        if (AddAkiller) {
+            free(reason);
+        }
     } else {
         syntax_error(s_OperServ, u, "CHANKILL", OPER_CHANKILL_SYNTAX);
     }
diff --git a/src/tools/db-merger.c b/src/tools/db-merger.c
index b229dbd12..030448b1b 100644
--- a/src/tools/db-merger.c
+++ b/src/tools/db-merger.c
@@ -84,8 +84,13 @@
 
 /* END OF CONFIGURATION BLOCK */
 
+#ifndef _WIN32
 #define C_LBLUE "\033[1;34m"
 #define C_NONE "\033[m"
+#else
+#define C_LBLUE ""
+#define C_NONE ""
+#endif
 
 #define getc_db(f)		(fgetc((f)->fp))
 #define HASH(nick)	((tolower((nick)[0])&31)<<5 | (tolower((nick)[1])&31))
diff --git a/src/tools/epona2anope.c b/src/tools/epona2anope.c
index 4bd94a113..dd3bef3ee 100644
--- a/src/tools/epona2anope.c
+++ b/src/tools/epona2anope.c
@@ -63,8 +63,13 @@
 
 /* END OF CONFIGURATION BLOCK */
 
+#ifndef _WIN32
 #define C_LBLUE "\033[1;34m"
 #define C_NONE "\033[m"
+#else
+#define C_LBLUE ""
+#define C_NONE ""
+#endif
 
 #define getc_db(f)		(fgetc((f)->fp))
 #define HASH(nick)	((tolower((nick)[0])&31)<<5 | (tolower((nick)[1])&31))
diff --git a/version.log b/version.log
index b4f198e4f..2d81678ad 100644
--- a/version.log
+++ b/version.log
@@ -9,10 +9,14 @@ VERSION_MAJOR="1"
 VERSION_MINOR="7"
 VERSION_PATCH="11"
 VERSION_EXTRA="-rc2"
-VERSION_BUILD="888"
+VERSION_BUILD="889"
 
 # $Log$
 #
+# BUILD : 1.7.11 (889)
+# BUGS  : 
+# NOTES : Applied patches by Trystan to: (1) Fix memleak when AddAkiller was enabled (2) Fix MySQL detection on win32 with install.vbs (3) Remove color codes from tools on win32
+#
 # BUILD : 1.7.11 (888)
 # BUGS  : 
 # NOTES : Anope 1.7.11-rc2