Make sure that the target user is able to join a local channel

[ngircd-alex.git] / src / ngircd / irc-op.c

diff --git a/src/ngircd/irc-op.c b/src/ngircd/irc-op.c
index 52126877dc1a6f27bc804b3a968499251d36e980..2e5c680aaa52ddde65b6a0ade839e90e96770cdb 100644 (file)
--- a/src/ngircd/irc-op.c
+++ b/src/ngircd/irc-op.c
@@ -1,6 +1,6 @@
 /*
  * ngIRCd -- The Next Generation IRC Daemon
- * Copyright (c)2001-2013 Alexander Barton (alex@barton.de) and Contributors.
+ * Copyright (c)2001-2014 Alexander Barton (alex@barton.de) and Contributors.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -16,12 +16,9 @@
  * Channel operator commands
  */
 
-#include "imp.h"
 #include <assert.h>
 #include <string.h>
-#include <stdio.h>
 
-#include "defines.h"
 #include "conn.h"
 #include "channel.h"
 #include "irc-macros.h"
@@ -31,7 +28,6 @@
 #include "messages.h"
 #include "parse.h"
 
-#include "exp.h"
 #include "irc-op.h"
 
 /* Local functions */
@@ -122,7 +118,6 @@ IRC_KICK(CLIENT *Client, REQUEST *Req)
                        nickCount--;
                }
        } else {
-               IRC_SetPenalty(Client, 2);
                return IRC_WriteErrClient(Client, ERR_NEEDMOREPARAMS_MSG,
                                        Client_ID(Client), Req->command);
        }
@@ -155,6 +150,14 @@ IRC_INVITE(CLIENT *Client, REQUEST *Req)
                return IRC_WriteErrClient(from, ERR_NOSUCHNICK_MSG,
                                          Client_ID(Client), Req->argv[0]);
 
+       if (Req->argv[1][0] == '&') {
+               /* Local channel. Make sure the target user is on this server! */
+               if (Client_Conn(target) == NONE)
+                       return IRC_WriteErrClient(from, ERR_USERNOTONSERV_MSG,
+                                                 Client_ID(Client),
+                                                 Req->argv[0]);
+       }
+
        chan = Channel_Search(Req->argv[1]);
        if (chan) {
                /* Channel exists. Is the user a valid member of the channel? */
@@ -171,7 +174,8 @@ IRC_INVITE(CLIENT *Client, REQUEST *Req)
 
                /* Is the channel "invite-only"? */
                if (Channel_HasMode(chan, 'i')) {
-                       /* Yes. The user must be channel owner/admin/operator/halfop! */
+                       /* Yes. The user issuing the INVITE command must be
+                        * channel owner/admin/operator/halfop! */
                        if (!Channel_UserHasMode(chan, from, 'q') &&
                            !Channel_UserHasMode(chan, from, 'a') &&
                            !Channel_UserHasMode(chan, from, 'o') &&
@@ -195,7 +199,8 @@ IRC_INVITE(CLIENT *Client, REQUEST *Req)
 
                if (remember) {
                        /* We must remember this invite */
-                       if (!Channel_AddInvite(chan, Client_Mask(target), true))
+                       if (!Channel_AddInvite(chan, Client_MaskCloaked(target),
+                                               true))
                                return CONNECTED;
                }
        }
@@ -204,21 +209,22 @@ IRC_INVITE(CLIENT *Client, REQUEST *Req)
                 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.
+        * RFC 2812 states:
+        * '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%s", Req->argv[0],
-                                       colon_if_necessary, Req->argv[1]);
+                                 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], colon_if_necessary, Req->argv[1]))
+                                              Client_ID(from), Req->argv[0],
+                                              colon_if_necessary, Req->argv[1]))
                        return DISCONNECTED;
 
                if (Client_HasMode(target, 'a') &&