Hide the server name/desc better when <options:hideserver> is set.

[user/henk/code/inspircd.git] / src / coremods / core_oper / cmd_oper.cpp

diff --git a/src/coremods/core_oper/cmd_oper.cpp b/src/coremods/core_oper/cmd_oper.cpp
index 8c3c86adc4df74d2af589ad3830b3e67dc9c4066..2ca017525101bdb348de0691b6bd5f1d0af8e12f 100644 (file)
--- a/src/coremods/core_oper/cmd_oper.cpp
+++ b/src/coremods/core_oper/cmd_oper.cpp
@@ -1,9 +1,15 @@
 /*
  * InspIRCd -- Internet Relay Chat Daemon
  *
+ *   Copyright (C) 2020 Matt Schatz <genius3000@g3k.solutions>
+ *   Copyright (C) 2013-2014, 2017-2018 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2012, 2014, 2016 Attila Molnar <attilamolnar@hush.com>
+ *   Copyright (C) 2012 Robby <robby@chatbelgie.be>
+ *   Copyright (C) 2009 Uli Schlachter <psychon@inspircd.org>
  *   Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
- *   Copyright (C) 2008 Thomas Stagner <aquanight@inspircd.org>
  *   Copyright (C) 2007 Robin Burchell <robin+git@viroteck.net>
+ *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
+ *   Copyright (C) 2006, 2008, 2010 Craig Edwards <brain@inspircd.org>
  *
  * This file is part of InspIRCd.  InspIRCd is free software: you can
  * redistribute it and/or modify it under the terms of the GNU General Public
@@ -48,7 +54,6 @@ CmdResult CommandOper::HandleLocal(LocalUser* user, const Params& parameters)
 
                if (match_pass && match_hosts)
                {
-                       /* found this oper's opertype */
                        user->Oper(ifo);
                        return CMD_SUCCESS;
                }
@@ -60,9 +65,10 @@ CmdResult CommandOper::HandleLocal(LocalUser* user, const Params& parameters)
        if (!match_pass)
                fields.append("password ");
        if (!match_hosts)
-               fields.append("hosts");
+               fields.append("hosts ");
+       fields.erase(fields.length() - 1, 1);
 
-       // tell them they suck, and lag them up to help prevent brute-force attacks
+       // Tell them they failed (generically) and lag them up to help prevent brute-force attacks
        user->WriteNumeric(ERR_NOOPERHOST, "Invalid oper credentials");
        user->CommandFloodPenalty += 10000;