From 7ceb358ec4c7ceb8d202ca18c1572804400b4a31 Mon Sep 17 00:00:00 2001 From: "certus certus@31f1291d-b8d6-0310-a050-a5561fc1590b" Date: Sun, 2 Jul 2006 16:37:28 +0000 Subject: [PATCH] # BUILD : 1.7.14 (1079) # BUGS : 529 531 # NOTES : applied trystan's fix and fixed some readonly stuff git-svn-id: svn://svn.anope.org/anope/trunk@1079 31f1291d-b8d6-0310-a050-a5561fc1590b git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@803 5417fbe8-f217-4b02-8779-1006273d7864 --- Changes | 2 ++ src/core/ms_del.c | 3 +++ src/modules.c | 25 +++++++++++++++++-------- version.log | 6 +++++- 4 files changed, 27 insertions(+), 9 deletions(-) diff --git a/Changes b/Changes index f50ab0150..ac7a8a574 100644 --- a/Changes +++ b/Changes @@ -40,6 +40,7 @@ Provided by Anope Dev. - 2006 06/20 F Versions in win32.rc are now updated correctly. [#526] 06/21 F Syntax for NickServ SET MSG showed syntax for SET PRIVATE. [ #00] 06/26 F A few small bugs with module configure scripts. [ #00] +07/02 F Fixed readonly stuff on memoserv del. [#529] Provided by ThaPrince - 2006 05/19 A Plexus 3 support. [ #00] @@ -47,6 +48,7 @@ Provided by ThaPrince - 2006 Provided by Trystan - 2006 06/15 F NS Resend delay. [ #00] +07/02 F Fixed module version stuff. [#531] Anope Version 1.7.14 -------------------- diff --git a/src/core/ms_del.c b/src/core/ms_del.c index 1fc3557c0..36ced1eff 100644 --- a/src/core/ms_del.c +++ b/src/core/ms_del.c @@ -78,6 +78,9 @@ int do_del(User * u) if (!(ci = cs_findchan(chan))) { notice_lang(s_MemoServ, u, CHAN_X_NOT_REGISTERED, chan); return MOD_CONT; + } else if (readonly) { + notice_lang(s_MemoServ, u, READ_ONLY_MODE); + return MOD_CONT; } else if (ci->flags & CI_VERBOTEN) { notice_lang(s_MemoServ, u, CHAN_X_FORBIDDEN, chan); return MOD_CONT; diff --git a/src/modules.c b/src/modules.c index d37454e67..2f42654da 100644 --- a/src/modules.c +++ b/src/modules.c @@ -585,15 +585,24 @@ int loadModule(Module * m, User * u) } if (func) { version = (int (*)())ano_modsym(m->handle,"getAnopeBuildVersion"); - if(version && version() >= VERSION_BUILD ) { - if(debug) { - alog("Module %s compiled against anope revision %d, this is %d",m->name,version(),VERSION_BUILD); - } - } else { + if (version) { + if (version() >= VERSION_BUILD ) { + if(debug) { + alog("Module %s compiled against current or newer anope revision %d, this is %d",m->name,version(),VERSION_BUILD); + } + } else { ano_modclose(m->handle); - ano_modclearerr(); - alog("Module %s is compiled against an old version of anope",m->name); - return MOD_ERR_NOLOAD; + ano_modclearerr(); + alog("Module %s is compiled against an old version of anope (%d) current is %d", m->name, version(), VERSION_BUILD); + alog("Rebuild module %s against the current version to resolve this error", m->name); + return MOD_ERR_NOLOAD; + } + } else { + ano_modclose(m->handle); + ano_modclearerr(); + alog("Module %s is compiled against an older version of anope (unknown)", m->name); + alog("Rebuild module %s against the current version to resolve this error", m->name); + return MOD_ERR_NOLOAD; } /* TODO */ mod_current_module_name = m->name; diff --git a/version.log b/version.log index 8474814b2..80f031db6 100644 --- a/version.log +++ b/version.log @@ -9,10 +9,14 @@ VERSION_MAJOR="1" VERSION_MINOR="7" VERSION_PATCH="14" VERSION_EXTRA="" -VERSION_BUILD="1078" +VERSION_BUILD="1079" # $Log$ # +# BUILD : 1.7.14 (1079) +# BUGS : 529 531 +# NOTES : applied trystan's fix and fixed some readonly stuff +# # BUILD : 1.7.14 (1078) # BUGS : 527 # NOTES : Applied path from heinz for... 1) fixes bug 527 2) adds mod version to windows stuff 3) fixes some ugly indentation in install.js 4) cleans up manifest files on spotless