Commit Diff
Diff:
5115756b793dffda86173d424444daf5801967a9
b54e664a635bf20cdfcc09dfbc68a909f9344968
b54e664a635bf20cdfcc09dfbc68a909f9344968
Commit:
b54e664a635bf20cdfcc09dfbc68a909f9344968
Tree:
09352bc93ec2be066b991fef2c419a2caefea7f1
Committer:
Alexander Barton <alex@barton.de>
Date:
Thu Jul 18 20:38:19 2013
UTC
Message:
Merge pull request #4 from fgsch/master
Changes for ngircd 21.
--- src/ngircd/conf.c
+++ 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.
--- src/ngircd/irc-info.c
+++ src/ngircd/irc-info.c
@@ -361,8 +361,15 @@ IRC_WHOIS_SendReply(CLIENT *Client, CLIENT *from, CLIE
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;