Rework check for number of parameters

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

diff --git a/src/ngircd/irc-oper.c b/src/ngircd/irc-oper.c
index 9907371eb82657c5ba05e3f693c0c4deb27eadc4..40633177a51babbe3d8971453f9b62818bec8a50 100644 (file)
--- a/src/ngircd/irc-oper.c
+++ b/src/ngircd/irc-oper.c
@@ -68,8 +68,6 @@ IRC_OPER( CLIENT *Client, REQUEST *Req )
        assert( Client != NULL );
        assert( Req != NULL );
 
-       _IRC_ARGC_EQ_OR_RETURN_(Client, Req, 2)
-
        len = array_length(&Conf_Opers, sizeof(*op));
        op = array_start(&Conf_Opers);
        for (i = 0; i < len && strcmp(op[i].name, Req->argv[0]); i++)
@@ -122,12 +120,6 @@ IRC_DIE(CLIENT * Client, REQUEST * Req)
        if (!Op_Check(Client, Req))
                return Op_NoPrivileges(Client, Req);
 
-#ifdef STRICT_RFC
-       _IRC_ARGC_EQ_OR_RETURN_(Client, Req, 0)
-#else
-       _IRC_ARGC_LE_OR_RETURN_(Client, Req, 1)
-#endif
-
        /* Is a message given? */
        if (Req->argc > 0) {
                c = Conn_First();
@@ -165,8 +157,6 @@ IRC_REHASH( CLIENT *Client, REQUEST *Req )
        if (!Op_Check(Client, Req))
                return Op_NoPrivileges(Client, Req);
 
-       _IRC_ARGC_EQ_OR_RETURN_(Client, Req, 0)
-
        Log(LOG_NOTICE|LOG_snotice, "Got REHASH command from \"%s\" ...",
            Client_Mask(Client));
        IRC_WriteStrClient(Client, RPL_REHASHING_MSG, Client_ID(Client));
@@ -194,11 +184,6 @@ IRC_RESTART( CLIENT *Client, REQUEST *Req )
        if (!Op_Check(Client, Req))
                return Op_NoPrivileges(Client, Req);
 
-       /* Bad number of parameters? */
-       if (Req->argc != 0)
-               return IRC_WriteErrClient(Client, ERR_NEEDMOREPARAMS_MSG,
-                                         Client_ID(Client), Req->command);
-
        Log(LOG_NOTICE|LOG_snotice, "Got RESTART command from \"%s\" ...",
            Client_Mask(Client));
        NGIRCd_SignalRestart = true;
@@ -221,10 +206,6 @@ IRC_CONNECT(CLIENT * Client, REQUEST * Req)
        assert(Client != NULL);
        assert(Req != NULL);
 
-       if (Client_Type(Client) != CLIENT_SERVER
-           && !Client_HasMode(Client, 'o'))
-               return Op_NoPrivileges(Client, Req);
-
        /* Bad number of parameters? */
        if (Req->argc != 1 && Req->argc != 2 && Req->argc != 3 &&
            Req->argc != 5 && Req->argc != 6)
@@ -236,6 +217,10 @@ IRC_CONNECT(CLIENT * Client, REQUEST * Req)
                return IRC_WriteErrClient(Client, ERR_NEEDMOREPARAMS_MSG,
                                          Client_ID(Client), Req->command);
 
+       if (Client_Type(Client) != CLIENT_SERVER
+           && !Client_HasMode(Client, 'o'))
+               return Op_NoPrivileges(Client, Req);
+
        from = Client;
        target = Client_ThisServer();
 
@@ -328,11 +313,6 @@ IRC_DISCONNECT(CLIENT * Client, REQUEST * Req)
        if (!Op_Check(Client, Req))
                return Op_NoPrivileges(Client, Req);
 
-       /* Bad number of parameters? */
-       if (Req->argc != 1)
-               return IRC_WriteErrClient(Client, ERR_NEEDMOREPARAMS_MSG,
-                                         Client_ID(Client), Req->command);
-
        IRC_SendWallops(Client_ThisServer(), Client_ThisServer(),
                        "Received DISCONNECT %s from %s",
                        Req->argv[0], Client_ID(Client));
@@ -371,8 +351,6 @@ IRC_WALLOPS( CLIENT *Client, REQUEST *Req )
        assert( Client != NULL );
        assert( Req != NULL );
 
-       _IRC_ARGC_EQ_OR_RETURN_(Client, Req, 1)
-
        switch (Client_Type(Client)) {
        case CLIENT_USER:
                if (!Client_OperByMe(Client))
@@ -412,15 +390,15 @@ IRC_xLINE(CLIENT *Client, REQUEST *Req)
        assert(Client != NULL);
        assert(Req != NULL);
 
-       from = Op_Check(Client, Req);
-       if (!from)
-               return Op_NoPrivileges(Client, Req);
-
        /* Bad number of parameters? */
        if (Req->argc != 1 && Req->argc != 3)
                return IRC_WriteErrClient(Client, ERR_NEEDMOREPARAMS_MSG,
                                          Client_ID(Client), Req->command);
 
+       from = Op_Check(Client, Req);
+       if (!from)
+               return Op_NoPrivileges(Client, Req);
+
        switch(Req->command[0]) {
                case 'g':
                case 'G':