summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorViper <viper@anope.org>2013-06-05 17:28:46 +0200
committerViper <viper@anope.org>2013-06-05 17:28:46 +0200
commitf1c3f0d820caedfd7667c09bd06f60b9c23283d9 (patch)
treee1a3a8acb44a54f4b04cf3f66a1cc773e982bb79
parent0a786568048b257561bb1337d21269b130122c7d (diff)
Bug #1527 - Fixed modules being loaded regardless of the load abort signal returned by a modules AnopeInit function. (Introduced in commit. e0c3069c)
-rw-r--r--Changes1
-rw-r--r--src/modules.c2
-rw-r--r--version.log3
3 files changed, 4 insertions, 2 deletions
diff --git a/Changes b/Changes
index da4862dd4..d26a8842f 100644
--- a/Changes
+++ b/Changes
@@ -1,5 +1,6 @@
Anope Version 1.8 - GIT
-------------------
+06/05 F Fixed modules being loaded regardless of the load abort signal. [#1527]
Provided by Michael Wobst - 2013
05/25 U Update Hybrid protocol module to support Hybrid 8.1
diff --git a/src/modules.c b/src/modules.c
index d63a8b130..9962a16fb 100644
--- a/src/modules.c
+++ b/src/modules.c
@@ -697,7 +697,7 @@ int loadModule(Module * m, User * u)
}
argc++;
- init_union.func(argc, argv); /* exec AnopeInit */
+ ret = init_union.func(argc, argv); /* exec AnopeInit */
if (u) {
free(argv[0]);
}
diff --git a/version.log b/version.log
index 38ed80cb4..d35658653 100644
--- a/version.log
+++ b/version.log
@@ -8,9 +8,10 @@ VERSION_MAJOR="1"
VERSION_MINOR="8"
VERSION_PATCH="9"
VERSION_EXTRA="-git"
-VERSION_BUILD="3115"
+VERSION_BUILD="3116"
# Changes since 1.8.8 Release
+#Revision 3116 - Bug #1527 - Fixed modules being loaded regardless of the load abort signal returned by a modules AnopeInit function. (Introduced in commit. e0c3069c)