X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?p=ngircd-alex.git;a=blobdiff_plain;f=src%2Fngircd%2Firc-op.c;h=34b0eb0f8e1fea9e00a0087947088b0978a3711e;hp=715323be3ddd0f947079bdb879b494ca674ab3a4;hb=03628dbeaf40a9de34b3eb6d5bf6dd34eed8248c;hpb=3d8eda9c860cbcbf195fe2242c67dd57fe966b3e

diff --git a/src/ngircd/irc-op.c b/src/ngircd/irc-op.c
index 715323be..34b0eb0f 100644
--- a/src/ngircd/irc-op.c
+++ b/src/ngircd/irc-op.c
@@ -7,13 +7,16 @@
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
  * Please read the file COPYING, README and AUTHORS for more information.
- *
- * Channel operator commands
  */
 
 
 #include "portab.h"
 
+/**
+ * @file
+ * Channel operator commands
+ */
+
 #include "imp.h"
 #include <assert.h>
 #include <string.h>
@@ -21,7 +24,6 @@
 
 #include "defines.h"
 #include "conn.h"
-#include "client.h"
 #include "channel.h"
 #include "irc-write.h"
 #include "lists.h"
@@ -34,14 +36,15 @@
 
 
 static bool
-try_kick(CLIENT* from, const char *nick, const char *channel, const char *reason)
+try_kick(CLIENT *peer, CLIENT* from, const char *nick, const char *channel,
+	 const char *reason)
 {
 	CLIENT *target = Client_Search(nick);
 
 	if (!target)
 		return IRC_WriteStrClient(from, ERR_NOSUCHNICK_MSG, Client_ID(from), nick);
 
-	Channel_Kick(target, from, channel, reason);
+	Channel_Kick(peer, target, from, channel, reason);
 	return true;
 }
 
@@ -93,7 +96,8 @@ IRC_KICK(CLIENT *Client, REQUEST *Req)
 	currentChannel = Req->argv[0];
 	if (channelCount == 1) {
 		while (nickCount > 0) {
-			if (!try_kick(from, currentNick, currentChannel, reason))
+			if (!try_kick(Client, from, currentNick,
+				      currentChannel, reason))
 				return false;
 
 			while (*currentNick)
@@ -104,7 +108,8 @@ IRC_KICK(CLIENT *Client, REQUEST *Req)
 		}
 	} else if (channelCount == nickCount) {
 		while (nickCount > 0) {
-			if (!try_kick(from, currentNick, currentChannel, reason))
+			if (!try_kick(Client, from, currentNick,
+				      currentChannel, reason))
 				return false;
 
 			while (*currentNick)
@@ -130,6 +135,7 @@ IRC_INVITE(CLIENT *Client, REQUEST *Req)
 {
 	CHANNEL *chan;
 	CLIENT *target, *from;
+	const char *colon_if_necessary;
 	bool remember = false;
 
 	assert( Client != NULL );
@@ -186,13 +192,23 @@ IRC_INVITE(CLIENT *Client, REQUEST *Req)
 
 	LogDebug("User \"%s\" invites \"%s\" to \"%s\" ...", Client_Mask(from), Req->argv[0], Req->argv[1]);
 
+
+	/*
+	 * RFC 2812 says:
+	 * 'There is no requirement that the channel [..] must exist or be a valid channel'
+	 * The problem with this is that this allows the "channel" to contain spaces,
+	 * in which case we must prefix its name with a colon to make it clear that
+	 * it is only a single argument.
+	 */
+	colon_if_necessary = strchr(Req->argv[1], ' ') ? ":":"";
 	/* Inform target client */
-	IRC_WriteStrClientPrefix(target, from, "INVITE %s %s", Req->argv[0], Req->argv[1]);
+	IRC_WriteStrClientPrefix(target, from, "INVITE %s %s%s", Req->argv[0],
+					colon_if_necessary, Req->argv[1]);
 
 	if (Client_Conn(target) > NONE) {
 		/* The target user is local, so we have to send the status code */
 		if (!IRC_WriteStrClientPrefix(from, target, RPL_INVITING_MSG,
-				Client_ID(from), Req->argv[0], Req->argv[1]))
+			Client_ID(from), Req->argv[0], colon_if_necessary, Req->argv[1]))
 			return DISCONNECTED;
 
 		if (strchr(Client_Modes(target), 'a') &&