commit b54e664a635bf20cdfcc09dfbc68a909f9344968
from: Alexander Barton <alex@barton.de>
date: Thu Jul 18 20:38:19 2013 UTC

Merge pull request #4 from fgsch/master

Changes for ngircd 21.

commit - 5115756b793dffda86173d424444daf5801967a9
commit + b54e664a635bf20cdfcc09dfbc68a909f9344968
blob - aad64b3e380444dff3e7769feef02cff684f33c2
blob + bae5fa7ad7b8f96467eb200092d0a85440102d7a
--- 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.
blob - 668f5ed6fc4c5be0bb8445531282398c7e52284c
blob + 046648fdfa02cab53369ccbf81f33de40801de0f
--- 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;