Merge pull request #4 from fgsch/master

Changes for ngircd 21.
This commit is contained in:
Alexander Barton 2013-07-18 13:38:19 -07:00
commit b54e664a63
2 changed files with 9 additions and 2 deletions

View File

@ -827,7 +827,7 @@ no_listenports(void)
/**
* Read contents of a text file into an array.
*
* This function is used to read the MOTD and help text file, for exampe.
* This function is used to read the MOTD and help text file, for example.
*
* @param filename Name of the file to read.
* @return true, when the file has been read in.

View File

@ -361,8 +361,15 @@ IRC_WHOIS_SendReply(CLIENT *Client, CLIENT *from, CLIENT *c)
return DISCONNECTED;
}
/* IRC-Services? */
if (Client_Type(c) == CLIENT_SERVICE &&
!IRC_WriteStrClient(from, RPL_WHOISSERVICE_MSG,
Client_ID(from), Client_ID(c)))
return DISCONNECTED;
/* IRC-Operator? */
if (Client_HasMode(c, 'o') &&
if (Client_Type(c) != CLIENT_SERVICE &&
Client_HasMode(c, 'o') &&
!IRC_WriteStrClient(from, RPL_WHOISOPERATOR_MSG,
Client_ID(from), Client_ID(c)))
return DISCONNECTED;