Module: ngircd.git Branch: master Commit: 3bf0c6f3b9cbeded68c2c7f7a6f2a020616b73f5 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=3bf0c...

Author: Alexander Barton alex@barton.de Date: Sun Apr 13 17:30:04 2008 +0200

Bad_OperPass(): code cleanup.

---

src/ngircd/irc-oper.c | 15 ++++++++++----- 1 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/ngircd/irc-oper.c b/src/ngircd/irc-oper.c index b0271df..736163c 100644 --- a/src/ngircd/irc-oper.c +++ b/src/ngircd/irc-oper.c @@ -35,14 +35,19 @@ #include "irc-oper.h"

+/** + * Handle invalid received OPER command. + * Log OPER attempt and send error message to client. + */ static bool Bad_OperPass(CLIENT *Client, char *errtoken, char *errmsg) { - Log( LOG_WARNING, "Got invalid OPER from "%s": "%s" -- %s", Client_Mask( Client ), - errtoken, errmsg); + Log(LOG_WARNING, "Got invalid OPER from "%s": "%s" -- %s", + Client_Mask(Client), errtoken, errmsg); IRC_SetPenalty(Client, 3); - return IRC_WriteStrClient( Client, ERR_PASSWDMISMATCH_MSG, Client_ID( Client )); -} + return IRC_WriteStrClient(Client, ERR_PASSWDMISMATCH_MSG, + Client_ID(Client)); +} /* Bad_OperPass */

GLOBAL bool @@ -63,7 +68,7 @@ IRC_OPER( CLIENT *Client, REQUEST *Req ) return Bad_OperPass(Client, Req->argv[0], "not configured");

if( strcmp( Conf_Oper[i].pwd, Req->argv[1] ) != 0 ) - return Bad_OperPass(Client, Conf_Oper[i].name, "Bad password"); + return Bad_OperPass(Client, Conf_Oper[i].name, "bad password");

if( Conf_Oper[i].mask && (! Match( Conf_Oper[i].mask, Client_Mask( Client ) ))) return Bad_OperPass(Client, Conf_Oper[i].mask, "hostmask check failed" );