m_names: honour userhost-in-names for global NAMES
This commit is contained in:
parent
507bdac642
commit
54c7ead605
1 changed files with 22 additions and 5 deletions
|
@ -172,14 +172,31 @@ names_global(struct Client *source_p)
|
||||||
if(dont_show)
|
if(dont_show)
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
if((cur_len + NICKLEN + 2) > (BUFSIZE - 3))
|
if (IsCapable(source_p, CLICAP_USERHOST_IN_NAMES))
|
||||||
{
|
{
|
||||||
sendto_one(source_p, "%s", buf);
|
if (cur_len + strlen(target_p->name) + strlen(target_p->username) + strlen(target_p->host) + strlen(" !@") >= BUFSIZE - strlen("\r\n"))
|
||||||
cur_len = mlen;
|
{
|
||||||
t = buf + mlen;
|
*(t - 1) = '\0';
|
||||||
|
sendto_one(source_p, "%s", buf);
|
||||||
|
cur_len = mlen;
|
||||||
|
t = buf + mlen;
|
||||||
|
}
|
||||||
|
|
||||||
|
tlen = sprintf(t, "%s!%s@%s ", target_p->name, target_p->username, target_p->host);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
if(cur_len + strlen(target_p->name) + strlen(" ") >= BUFSIZE - strlen("\r\n"))
|
||||||
|
{
|
||||||
|
*(t - 1) = '\0';
|
||||||
|
sendto_one(source_p, "%s", buf);
|
||||||
|
cur_len = mlen;
|
||||||
|
t = buf + mlen;
|
||||||
|
}
|
||||||
|
|
||||||
|
tlen = sprintf(t, "%s ", target_p->name);
|
||||||
}
|
}
|
||||||
|
|
||||||
tlen = sprintf(t, "%s ", target_p->name);
|
|
||||||
cur_len += tlen;
|
cur_len += tlen;
|
||||||
t += tlen;
|
t += tlen;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue