diff options
| -rw-r--r-- | src/memoserv.c | 4 | ||||
| -rw-r--r-- | version.log | 3 |
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 |