9pfs/solanum-vs-hackint-and-charybdis
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

WHOIS: use cipher string if available

Browse source
This commit is contained in:
William Pitcock 2015-12-11 08:20:11 -06:00
parent ebe33dbfab
commit 427a8d5dbb
2 changed files with 14 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/messages.h
View file

@ -200,7 +200,7 @@
#define NUMERIC_STR_517 "%s :This command has been administratively disabled"
#define NUMERIC_STR_524 ":%s 524 %s %s :Help not found"
#define NUMERIC_STR_670 ":STARTTLS successful, proceed with TLS handshake"
#define NUMERIC_STR_671 "%s :is using a secure connection"
#define NUMERIC_STR_671 "%s :%s"
#define NUMERIC_STR_691 ":%s"
#define NUMERIC_STR_702 ":%s 702 %s %s 0x%lx %s %s"
#define NUMERIC_STR_703 ":%s 703 %s :End of /MODLIST."

19
modules/m_whois.c
View file

@ -320,13 +320,20 @@ single_whois(struct Client *source_p, struct Client *target_p, int operspy)
}
if(IsSSLClient(target_p))
{
char cbuf[256] = "is using a secure connection";
if (MyClient(target_p) && target_p->localClient->cipher_string != NULL)
rb_snprintf_append(cbuf, sizeof(cbuf), " [%s]", target_p->localClient->cipher_string);
sendto_one_numeric(source_p, RPL_WHOISSECURE, form_str(RPL_WHOISSECURE),
target_p->name);
if((source_p == target_p || IsOper(source_p)) &&
target_p->certfp != NULL)
sendto_one_numeric(source_p, RPL_WHOISCERTFP,
form_str(RPL_WHOISCERTFP),
target_p->name, target_p->certfp);
target_p->name, cbuf);
if((source_p == target_p || IsOper(source_p)) &&
target_p->certfp != NULL)
sendto_one_numeric(source_p, RPL_WHOISCERTFP,
form_str(RPL_WHOISCERTFP),
target_p->name, target_p->certfp);
}
if(MyClient(target_p))
{