diff options
| author | geniusdex geniusdex@31f1291d-b8d6-0310-a050-a5561fc1590b <geniusdex geniusdex@31f1291d-b8d6-0310-a050-a5561fc1590b@5417fbe8-f217-4b02-8779-1006273d7864> | 2005-09-18 11:46:04 +0000 |
|---|---|---|
| committer | geniusdex geniusdex@31f1291d-b8d6-0310-a050-a5561fc1590b <geniusdex geniusdex@31f1291d-b8d6-0310-a050-a5561fc1590b@5417fbe8-f217-4b02-8779-1006273d7864> | 2005-09-18 11:46:04 +0000 |
| commit | 05879f80d99a8beb0afec70ed13055c681c3c400 (patch) | |
| tree | 2059c4fa7edfbf485066b70a64e172a6c01cac37 /src | |
| parent | 4d649ac1bec1894515efb5bb8e10fc44175cf047 (diff) | |
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
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/os_akill.c | 15 | ||||
| -rw-r--r-- | src/core/os_chankill.c | 3 | ||||
| -rw-r--r-- | src/tools/db-merger.c | 5 | ||||
| -rw-r--r-- | src/tools/epona2anope.c | 5 |
4 files changed, 24 insertions, 4 deletions
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)) |