summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Changes2
-rw-r--r--src/bin/anoperc.in4
-rw-r--r--src/modules/hs_request.c28
-rw-r--r--version.log7
4 files changed, 24 insertions, 17 deletions
diff --git a/Changes b/Changes
index 9aa78df29..cfdc38fcf 100644
--- a/Changes
+++ b/Changes
@@ -4,6 +4,8 @@ Anope Version S V N
10/18 F MLock support for +c was missing on ultimate3. [ #00]
10/20 F Error message when unable to register due to NSRegDelay. [#616]
10/21 F svspart sends svspart instead of eob. [#617]
+11/02 F hs_request no longer returns MOD_STOP. [ #00]
+11/02 F anoperc sends correct signalls. [#623]
Anope Version 1.7.17
--------------------
diff --git a/src/bin/anoperc.in b/src/bin/anoperc.in
index f1e9def49..012e4db78 100644
--- a/src/bin/anoperc.in
+++ b/src/bin/anoperc.in
@@ -98,14 +98,14 @@ elif [ "$1" = "status" ] ; then
elif [ "$1" = "restart" ] ; then
isAnopeRunning
echo "Restarting Anope"
- kill -15 `cat $ANOPEPID`
+ kill -1 `cat $ANOPEPID`
sleep 1
$ANOPROG $*
elif [ "$1" = "rehash" ] ; then
isAnopeRunning
echo "Saving Databases and Rehashing Configuration"
- kill -1 `cat $ANOPEPID`
+ kill -12 `cat $ANOPEPID`
elif [ "$1" = "version" ] ; then
$ANOPROG -version
diff --git a/src/modules/hs_request.c b/src/modules/hs_request.c
index 38ec0e04d..3a4352de7 100644
--- a/src/modules/hs_request.c
+++ b/src/modules/hs_request.c
@@ -171,7 +171,7 @@ int hs_do_request(User * u)
if (rawhostmask)
free(rawhostmask);
moduleNoticeLang(s_HostServ, u, LNG_REQUEST_SYNTAX);
- return MOD_STOP;
+ return MOD_CONT;
}
vIdent = myStrGetOnlyToken(rawhostmask, '@', 0); /* Get the first substring, @ as delimiter */
@@ -180,20 +180,20 @@ int hs_do_request(User * u)
if (!rawhostmask) {
moduleNoticeLang(s_HostServ, u, LNG_REQUEST_SYNTAX);
free(vIdent);
- return MOD_STOP;
+ return MOD_CONT;
}
if (strlen(vIdent) > USERMAX - 1) {
notice_lang(s_HostServ, u, HOST_SET_IDENTTOOLONG, USERMAX);
free(vIdent);
free(rawhostmask);
- return MOD_STOP;
+ return MOD_CONT;
} else {
for (s = vIdent; *s; s++) {
if (!my_isvalidchar(*s)) {
notice_lang(s_HostServ, u, HOST_SET_IDENT_ERROR);
free(vIdent);
free(rawhostmask);
- return MOD_STOP;
+ return MOD_CONT;
}
}
}
@@ -201,7 +201,7 @@ int hs_do_request(User * u)
notice_lang(s_HostServ, u, HOST_NO_VIDENT);
free(vIdent);
free(rawhostmask);
- return MOD_STOP;
+ return MOD_CONT;
}
}
if (strlen(rawhostmask) < HOSTMAX - 1) {
@@ -211,7 +211,7 @@ int hs_do_request(User * u)
if (vIdent)
free(vIdent);
free(rawhostmask);
- return MOD_STOP;
+ return MOD_CONT;
}
if (!isValidHost(hostmask, 3)) {
@@ -219,7 +219,7 @@ int hs_do_request(User * u)
if (vIdent)
free(vIdent);
free(rawhostmask);
- return MOD_STOP;
+ return MOD_CONT;
}
tmp_time = time(NULL);
@@ -233,7 +233,7 @@ int hs_do_request(User * u)
if (vIdent)
free(vIdent);
free(rawhostmask);
- return MOD_STOP;
+ return MOD_CONT;
}
}
my_add_host_request(nick, vIdent, hostmask, u->nick, tmp_time);
@@ -249,7 +249,7 @@ int hs_do_request(User * u)
free(vIdent);
free(rawhostmask);
- return MOD_STOP;
+ return MOD_CONT;
}
void my_memo_lang(User * u, char *name, int z, int number, ...)
@@ -359,7 +359,7 @@ int hs_do_reject(User * u)
moduleNoticeLang(s_HostServ, u, LNG_REJECT_SYNTAX);
if (reason)
free(reason);
- return MOD_STOP;
+ return MOD_CONT;
}
tmp = findHostCore(hs_request_head, nick, &found);
@@ -389,7 +389,7 @@ int hs_do_reject(User * u)
if (reason)
free(reason);
- return MOD_STOP;
+ return MOD_CONT;
}
int hs_do_activate(User * u)
@@ -405,7 +405,7 @@ int hs_do_activate(User * u)
if (!nick) {
moduleNoticeLang(s_HostServ, u, LNG_ACTIVATE_SYNTAX);
- return MOD_STOP;
+ return MOD_CONT;
}
if ((na = findnick(nick))) {
@@ -434,7 +434,7 @@ int hs_do_activate(User * u)
}
free(nick);
- return MOD_STOP;
+ return MOD_CONT;
}
@@ -483,7 +483,7 @@ int hs_do_list_out(User * u)
show_list(u);
- return MOD_STOP;
+ return MOD_CONT;
}
int hs_do_waiting(User * u)
diff --git a/version.log b/version.log
index d4b1e6481..1e543ff81 100644
--- a/version.log
+++ b/version.log
@@ -9,10 +9,15 @@ VERSION_MAJOR="1"
VERSION_MINOR="7"
VERSION_PATCH="17"
VERSION_EXTRA="-svn"
-VERSION_BUILD="1195"
+VERSION_BUILD="1196"
# $Log$
#
+# BUILD : 1.7.17 (1196)
+# BUGS : 623
+# NOTES : Applied marks 623 patch, didnt apply the 621 patch as only en_us.l has been updated in it.
+#
+#
# BUILD : 1.7.17 (1195)
# BUGS : N/A
# NOTES : testing...