diff options
| author | michael <michael@82007160-df01-0410-b94d-b575c5fd34c7> | 2013-04-21 09:41:40 +0000 |
|---|---|---|
| committer | michael <michael@82007160-df01-0410-b94d-b575c5fd34c7> | 2013-04-21 09:41:40 +0000 |
| commit | f93d2932847e4c5b75448dbe34c8031f51144e09 (patch) | |
| tree | 5f3a56a11178a66811aad0fbaede42b7c6e181b7 | |
| parent | 18eddaf3a60077910f503a1c89d327c3ba62fed6 (diff) | |
- Add ERR_CHANBANREASON (numeric 485)
git-svn-id: svn://svn.ircd-hybrid.org/svnroot/ircd-hybrid/trunk@1839 82007160-df01-0410-b94d-b575c5fd34c7
| -rw-r--r-- | include/numeric.h | 1 | ||||
| -rw-r--r-- | modules/core/m_join.c | 4 | ||||
| -rw-r--r-- | src/numeric.c | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/include/numeric.h b/include/numeric.h index 205d6ec..4209a2b 100644 --- a/include/numeric.h +++ b/include/numeric.h @@ -236,6 +236,7 @@ extern const char *form_str(unsigned int); #define ERR_CHANOPRIVSNEEDED 482 #define ERR_CANTKILLSERVER 483 #define ERR_RESTRICTED 484 +#define ERR_CHANBANREASON 485 #define ERR_NONONREG 486 #define ERR_NOOPERHOST 491 #define ERR_UMODEUNKNOWNFLAG 501 diff --git a/modules/core/m_join.c b/modules/core/m_join.c index c5b21e4..2073d5d 100644 --- a/modules/core/m_join.c +++ b/modules/core/m_join.c @@ -139,8 +139,8 @@ m_join(struct Client *client_p, struct Client *source_p, { if (conf) ++conf->count; - sendto_one(source_p, form_str(ERR_BADCHANNAME), - me.name, source_p->name, chan); + sendto_one(source_p, form_str(ERR_CHANBANREASON), me.name, source_p->name, + chan, conf ? conf->reason : "Reserved channel"); sendto_realops_flags(UMODE_SPY, L_ALL, SEND_NOTICE, "Forbidding reserved channel [%s] from user %s", chan, get_client_name(source_p, HIDE_IP)); diff --git a/src/numeric.c b/src/numeric.c index 24e4c94..06fdd26 100644 --- a/src/numeric.c +++ b/src/numeric.c @@ -512,7 +512,7 @@ static const char *replies[] = { /* 482 ERR_CHANOPRIVSNEEDED */ ":%s 482 %s %s :You're not channel operator", /* 483 ERR_CANTKILLSERVER */ ":%s 483 %s :You can't kill a server!", /* 484 ERR_RESTRICTED */ ":%s 484 %s :You are restricted", -/* 485 */ NULL, +/* 485 ERR_CHANBANREASON */ ":%s 485 %s %s :Cannot join channel (%s)", /* 486 ERR_NONONREG */ ":%s 486 %s %s :You must identify to a registered nick to private message that person", /* 487 */ NULL, /* 488 */ NULL, |