summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormichael <michael@82007160-df01-0410-b94d-b575c5fd34c7>2013-04-21 09:36:19 +0000
committermichael <michael@82007160-df01-0410-b94d-b575c5fd34c7>2013-04-21 09:36:19 +0000
commit18eddaf3a60077910f503a1c89d327c3ba62fed6 (patch)
tree0b862088f112fac873719662f8265c6a1997cf9b
parentd3ba377982adb2fb5410445049aa39a0467eba11 (diff)
- Numeric 432 now shows the actual reason of quarantined nicknames
git-svn-id: svn://svn.ircd-hybrid.org/svnroot/ircd-hybrid/trunk@1838 82007160-df01-0410-b94d-b575c5fd34c7
-rw-r--r--modules/core/m_nick.c11
-rw-r--r--src/numeric.c2
2 files changed, 7 insertions, 6 deletions
diff --git a/modules/core/m_nick.c b/modules/core/m_nick.c
index a490292..bd86fd7 100644
--- a/modules/core/m_nick.c
+++ b/modules/core/m_nick.c
@@ -217,7 +217,8 @@ mr_nick(struct Client *client_p, struct Client *source_p,
if (!valid_nickname(nick, 1))
{
sendto_one(source_p, form_str(ERR_ERRONEUSNICKNAME), me.name,
- source_p->name[0] ? source_p->name : "*", parv[1]);
+ source_p->name[0] ? source_p->name : "*", parv[1],
+ "Erroneous Nickname");
return;
}
@@ -226,7 +227,7 @@ mr_nick(struct Client *client_p, struct Client *source_p,
{
++conf->count;
sendto_one(source_p, form_str(ERR_ERRONEUSNICKNAME), me.name,
- source_p->name[0] ? source_p->name : "*", nick);
+ source_p->name[0] ? source_p->name : "*", nick, conf->reason);
sendto_realops_flags(UMODE_REJ, L_ALL, SEND_NOTICE,
"Forbidding reserved nick [%s] from user %s",
nick, get_client_name(client_p, HIDE_IP));
@@ -283,8 +284,8 @@ m_nick(struct Client *client_p, struct Client *source_p,
/* check the nickname is ok */
if (!valid_nickname(nick, 1))
{
- sendto_one(source_p, form_str(ERR_ERRONEUSNICKNAME),
- me.name, source_p->name, nick);
+ sendto_one(source_p, form_str(ERR_ERRONEUSNICKNAME), me.name,
+ source_p->name, nick, "Erroneous Nickname");
return;
}
@@ -295,7 +296,7 @@ m_nick(struct Client *client_p, struct Client *source_p,
{
++conf->count;
sendto_one(source_p, form_str(ERR_ERRONEUSNICKNAME),
- me.name, source_p->name, nick);
+ me.name, source_p->name, nick, conf->reason);
sendto_realops_flags(UMODE_REJ, L_ALL, SEND_NOTICE,
"Forbidding reserved nick [%s] from user %s",
nick, get_client_name(client_p, HIDE_IP));
diff --git a/src/numeric.c b/src/numeric.c
index 16d94d8..24e4c94 100644
--- a/src/numeric.c
+++ b/src/numeric.c
@@ -459,7 +459,7 @@ static const char *replies[] = {
/* 429 */ NULL,
/* 430 */ NULL,
/* 431 ERR_NONICKNAMEGIVEN */ ":%s 431 %s :No nickname given",
-/* 432 ERR_ERRONEUSNICKNAME */ ":%s 432 %s %s :Erroneous Nickname",
+/* 432 ERR_ERRONEUSNICKNAME */ ":%s 432 %s %s :%s",
/* 433 ERR_NICKNAMEINUSE */ ":%s 433 %s %s :Nickname is already in use.",
/* 434 */ NULL,
/* 435 */ NULL,