First check if channel has mode "N", then check membership

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

diff --git a/src/ngircd/irc-cap.c b/src/ngircd/irc-cap.c
index 7fcba73fea9bbd14b3f8ec596b98a12c3276a291..bf4c9cd0c42a84a6e49ccb7e0c045ebc43034b6f 100644 (file)
--- a/src/ngircd/irc-cap.c
+++ b/src/ngircd/irc-cap.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,22 +16,19 @@
  * Handler for IRC capability ("CAP") commands
  */
 
-#include "imp.h"
 #include <assert.h>
 #include <string.h>
+#include <strings.h>
 
-#include "defines.h"
 #include "conn.h"
 #include "channel.h"
 #include "client-cap.h"
-#include "irc-macros.h"
 #include "irc-write.h"
 #include "log.h"
 #include "login.h"
 #include "messages.h"
 #include "parse.h"
 
-#include "exp.h"
 #include "irc-cap.h"
 
 /* Local functions */
@@ -250,8 +247,6 @@ IRC_CAP(CLIENT *Client, REQUEST *Req)
        assert(Client != NULL);
        assert(Req != NULL);
 
-       _IRC_ARGC_BETWEEN_OR_RETURN_(Client, Req, 1, 2)
-
        LogDebug("Got \"%s %s\" command from \"%s\" ...",
                 Req->command, Req->argv[0], Client_ID(Client));