commit 4cb36e370ec37554ff0ba3e26001b6bef5e4563d from: Alexander Barton date: Tue Jan 21 22:04:59 2014 UTC Merge pull request #5 from grawity/accountname-whois Show account name in WHOIS commit - 3b24ebf122fd8661437be244eb851d8f7d04408f commit + 4cb36e370ec37554ff0ba3e26001b6bef5e4563d blob - aa98a5b560b163f4b96a5b4c7b1a20b7f4f6f2f3 blob + cd5e45c12a28b2d834a326977aab906b610b955c --- src/ngircd/irc-info.c +++ src/ngircd/irc-info.c @@ -401,6 +401,13 @@ IRC_WHOIS_SendReply(CLIENT *Client, CLIENT *from, CLIE Client_ID(from), Client_ID(c))) return DISCONNECTED; + /* Account name metadata? */ + if (Client_AccountName(c) && + !IRC_WriteStrClient(from, RPL_WHOISLOGGEDIN_MSG, + Client_ID(from), Client_ID(c), + Client_AccountName(c))) + return DISCONNECTED; + /* Local client and requester is the user itself or an IRC Op? */ if (Client_Conn(c) > NONE && (from == c || (!Conf_MorePrivacy && Client_HasMode(from, 'o')))) { blob - f3a0ba442ac97ee82dd950607259b71302b5e526 blob + a56bf866ed35810fa0e1c73d7c98a4fd67d772ab --- src/ngircd/messages.h +++ src/ngircd/messages.h @@ -71,6 +71,7 @@ #define RPL_LISTEND_MSG "323 %s :End of LIST" #define RPL_CHANNELMODEIS_MSG "324 %s %s +%s" #define RPL_CREATIONTIME_MSG "329 %s %s %ld" +#define RPL_WHOISLOGGEDIN_MSG "330 %s %s %s :is logged in as" #define RPL_NOTOPIC_MSG "331 %s %s :No topic is set" #define RPL_TOPIC_MSG "332 %s %s :%s" #define RPL_TOPICSETBY_MSG "333 %s %s %s %u"