Release v2.0.21

[user/henk/code/inspircd.git] / src / commands / cmd_names.cpp

diff --git a/src/commands/cmd_names.cpp b/src/commands/cmd_names.cpp
index f34afb361dfd5da334b451dc456da993022e75cd..fd4a9cef51950a4a8d6c4c4fb0a9be8fd05c50c0 100644 (file)
--- a/src/commands/cmd_names.cpp
+++ b/src/commands/cmd_names.cpp
@@ -20,14 +20,6 @@
 
 #include "inspircd.h"
 
-#ifndef CMD_NAMES_H
-#define CMD_NAMES_H
-
-// include the common header files
-
-#include "users.h"
-#include "channels.h"
-
 /** Handle /NAMES. These command handlers can be reloaded by the core,
  * and handle basic RFC1459 commands. Commands within modules work
  * the same way, however, they can be fully unloaded, where these
@@ -48,9 +40,6 @@ class CommandNames : public Command
        CmdResult Handle(const std::vector<std::string>& parameters, User *user);
 };
 
-#endif
-
-
 /** Handle /NAMES
  */
 CmdResult CommandNames::Handle (const std::vector<std::string>& parameters, User *user)
@@ -69,11 +58,6 @@ CmdResult CommandNames::Handle (const std::vector<std::string>& parameters, User
        c = ServerInstance->FindChan(parameters[0]);
        if (c)
        {
-               if ((c->IsModeSet('s')) && (!c->HasUser(user)))
-               {
-                     user->WriteNumeric(401, "%s %s :No such nick/channel",user->nick.c_str(), c->name.c_str());
-                     return CMD_FAILURE;
-               }
                c->UserList(user);
        }
        else