summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam <Adam@anope.org>2011-01-09 20:05:11 -0500
committerAdam <Adam@anope.org>2011-01-09 20:05:11 -0500
commitf4d7ae2e1245c9421aee41229a1a20a56188c7b1 (patch)
tree9b0e4362cf864a6cd4be82daadcdff073d6bc108
parent826e040d4193589d2d0d29499dcae2befa649c5e (diff)
Do not allow services opers to send one person more than 32767 memos
-rw-r--r--src/memoserv.c4
-rw-r--r--version.log3
2 files changed, 4 insertions, 3 deletions
diff --git a/src/memoserv.c b/src/memoserv.c
index 8e33e6225..a5e3113bf 100644
--- a/src/memoserv.c
+++ b/src/memoserv.c
@@ -247,8 +247,8 @@ void memo_send(User * u, char *name, char *text, int z)
if (z == 0 || z == 3)
notice_lang(s_MemoServ, u, MEMO_X_GETS_NO_MEMOS, name);
- } else if (mi->memomax > 0 && mi->memocount >= mi->memomax
- && !is_servoper) {
+ } else if (mi->memocount >= 32767 || (mi->memomax > 0 && mi->memocount >= mi->memomax
+ && !is_servoper)) {
if (z == 0 || z == 3)
notice_lang(s_MemoServ, u, MEMO_X_HAS_TOO_MANY_MEMOS, name);
diff --git a/version.log b/version.log
index 23408d24e..70efdc626 100644
--- a/version.log
+++ b/version.log
@@ -8,9 +8,10 @@ VERSION_MAJOR="1"
VERSION_MINOR="8"
VERSION_PATCH="5"
VERSION_EXTRA="-git"
-VERSION_BUILD="3054"
+VERSION_BUILD="3055"
# $Log$ # Changes since 1.8.5 Release
+#Revision 3055 - Do not allow services opers to send one person more than 32767 memos
#Revision 3054 - Enable NICKIP for InspIRCd 1.2+
#Revision 3053 - Some more copyright/typo fixes, spotted by chaz :P
#Revision 3052 - Updated Copyright to 2011