Fix Get_Error() usage, take II

[ngircd-alex.git] / src / ngircd / parse.c

diff --git a/src/ngircd/parse.c b/src/ngircd/parse.c
index 94230c87a099c9d5eacb40016d5a6c790603ecef..13a92ac250bf06962c9b2984eba70c679d9a9401 100644 (file)
--- a/src/ngircd/parse.c
+++ b/src/ngircd/parse.c
@@ -1,6 +1,6 @@
 /*
  * ngIRCd -- The Next Generation IRC Daemon
- * Copyright (c)2001-2014 Alexander Barton (alex@barton.de) and Contributors.
+ * Copyright (c)2001-2015 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
@@ -70,7 +70,7 @@ static COMMAND My_Commands[] =
        _CMD("GLINE", IRC_xLINE, CLIENT_USER|CLIENT_SERVER, 0, -1, 0),
        _CMD("HELP", IRC_HELP, CLIENT_USER, 0, 1, 2),
        _CMD("INFO", IRC_INFO, CLIENT_USER|CLIENT_SERVER, 0, 1, 2),
-       _CMD("INVITE", IRC_INVITE, CLIENT_USER|CLIENT_SERVER, 2, 2, 0),
+       _CMD("INVITE", IRC_INVITE, CLIENT_USER|CLIENT_SERVER, 2, 2, 1),
        _CMD("ISON", IRC_ISON, CLIENT_USER, 1, -1, 0),
        _CMD("JOIN", IRC_JOIN, CLIENT_USER|CLIENT_SERVER, 1, 2, 0),
        _CMD("KICK", IRC_KICK, CLIENT_USER|CLIENT_SERVER, 2, 3, 0),
@@ -156,7 +156,7 @@ Parse_GetCommandStruct( void )
 
 /**
  * Parse a command ("request") received from a client.
- * 
+ *
  * This function is called after the connection layer received a valid CR+LF
  * terminated line of text: we assume that this is a valid IRC command and
  * try to do something useful with it :-)
@@ -342,7 +342,7 @@ Validate_Prefix( CONN_ID Idx, REQUEST *Req, bool *Closed )
        /* check if the client named in the prefix is expected
         * to come from that direction */
        if (Client_NextHop(c) != client) {
-               if (Client_Type(c) != CLIENT_SERVER) {
+               if (Client_Type(client) != CLIENT_SERVER) {
                        Log(LOG_ERR,
                            "Spoofed prefix \"%s\" from \"%s\" (connection %d, command \"%s\"), closing connection!",
                            Req->prefix, Client_ID(client), Idx, Req->command);
@@ -461,10 +461,10 @@ Handle_Numeric(CLIENT *client, REQUEST *Req)
        }
 
        /* Determine source */
-       if (! Req->prefix[0]) {
-               /* Oops, no prefix!? */
-               Log(LOG_WARNING, "Got status code %s from \"%s\" without prefix!?",
-                                               Req->command, Client_ID(client));
+       if (!Req->prefix) {
+               Log(LOG_WARNING,
+                   "Got status code %s from \"%s\" without prefix!?",
+                   Req->command, Client_ID(client));
                return true;
        }