diff options
| author | Alexander Barton <alex@barton.de> | 2013-07-18 13:38:19 -0700 |
|---|---|---|
| committer | Alexander Barton <alex@barton.de> | 2013-07-18 13:38:19 -0700 |
| commit | b54e664a635bf20cdfcc09dfbc68a909f9344968 (patch) | |
| tree | 09352bc93ec2be066b991fef2c419a2caefea7f1 /src | |
| parent | 5115756b793dffda86173d424444daf5801967a9 (diff) | |
| parent | 7adc4b8e99c64c150861c6ad5a197d88141afa13 (diff) | |
| download | ngircd-b54e664a635bf20cdfcc09dfbc68a909f9344968.tar.gz ngircd-b54e664a635bf20cdfcc09dfbc68a909f9344968.zip | |
Merge pull request #4 from fgsch/master
Changes for ngircd 21.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ngircd/conf.c | 2 | ||||
| -rw-r--r-- | src/ngircd/irc-info.c | 9 |
2 files changed, 9 insertions, 2 deletions
diff --git a/src/ngircd/conf.c b/src/ngircd/conf.c index aad64b3e..bae5fa7a 100644 --- a/src/ngircd/conf.c +++ b/src/ngircd/conf.c @@ -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. diff --git a/src/ngircd/irc-info.c b/src/ngircd/irc-info.c index 668f5ed6..046648fd 100644 --- a/src/ngircd/irc-info.c +++ b/src/ngircd/irc-info.c @@ -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; |