summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authortrystan trystan@31f1291d-b8d6-0310-a050-a5561fc1590b <trystan trystan@31f1291d-b8d6-0310-a050-a5561fc1590b@5417fbe8-f217-4b02-8779-1006273d7864>2004-10-30 15:25:04 +0000
committertrystan trystan@31f1291d-b8d6-0310-a050-a5561fc1590b <trystan trystan@31f1291d-b8d6-0310-a050-a5561fc1590b@5417fbe8-f217-4b02-8779-1006273d7864>2004-10-30 15:25:04 +0000
commit327bead9394d818df8f0dc5613a10503eec48311 (patch)
treef913cfe67c2f59ff5ebf6cd66d97823c9dcf8b00 /src
parent8b59411646d1fba0e2c1bfa0c662af958b1e5775 (diff)
BUILD : 1.7.5 (435) BUGS : 203, 204, 205 NOTES : 1. minor fix to CS CLEAR, 2. Added to DrSteins more CS obsecure password, 3. fixed memoserv not using the correct message, 4. fixed botserv info to tell the channel is forbidden
git-svn-id: svn://svn.anope.org/anope/trunk@435 31f1291d-b8d6-0310-a050-a5561fc1590b git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@290 5417fbe8-f217-4b02-8779-1006273d7864
Diffstat (limited to 'src')
-rw-r--r--src/botserv.c4
-rw-r--r--src/chanserv.c8
-rw-r--r--src/memoserv.c2
3 files changed, 11 insertions, 3 deletions
diff --git a/src/botserv.c b/src/botserv.c
index f7507ffef..c903f43d0 100644
--- a/src/botserv.c
+++ b/src/botserv.c
@@ -1612,6 +1612,10 @@ static int do_info(User * u)
notice_lang(s_BotServ, u, PERMISSION_DENIED);
return MOD_CONT;
}
+ if (ci->flags & CI_VERBOTEN) {
+ notice_lang(s_BotServ, u, CHAN_X_FORBIDDEN, query);
+ return MOD_CONT;
+ }
notice_lang(s_BotServ, u, BOT_INFO_CHAN_HEADER, ci->name);
if (ci->bi)
diff --git a/src/chanserv.c b/src/chanserv.c
index 5329964e3..46c06b930 100644
--- a/src/chanserv.c
+++ b/src/chanserv.c
@@ -3118,9 +3118,13 @@ static int do_set_successor(User * u, ChannelInfo * ci, char *param)
static int do_set_password(User * u, ChannelInfo * ci, char *param)
{
-#ifdef USE_ENCRYPTION
int len = strlen(param);
+ if (stricmp(u->nick, param) == 0 || (StrictPasswords && len < 5)) {
+ notice_lang(s_ChanServ, u, MORE_OBSCURE_PASSWORD);
+ return MOD_CONT;
+ }
+#ifdef USE_ENCRYPTION
if (len > PASSMAX) {
len = PASSMAX;
param[len] = 0;
@@ -5918,7 +5922,7 @@ static int do_clear(User * u)
/* to prevent the internals from complaining send -k, -L, -f by themselves if we need
to send them - TSL */
if (c->key) {
- anope_cmd_mode(s_ChanServ, c->name, "-k %s", c->key);
+ anope_cmd_mode(whosends(ci), c->name, "-k %s", c->key);
argv[0] = sstrdup("-k");
argv[1] = c->key;
chan_set_modes(whosends(ci), c, 2, argv, 0);
diff --git a/src/memoserv.c b/src/memoserv.c
index e9e86f66c..4c7d40463 100644
--- a/src/memoserv.c
+++ b/src/memoserv.c
@@ -1093,7 +1093,7 @@ static int do_info(User * u)
else if (count == 0)
notice_lang(s_MemoServ, u, MEMO_INFO_X_MEMOS, name,
mi->memocount);
- else if (count == 0)
+ else if (count == 1)
notice_lang(s_MemoServ, u, MEMO_INFO_X_MEMOS_ONE_UNREAD,
name, mi->memocount);
else