X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?p=ngircd-alex.git;a=blobdiff_plain;f=src%2Fngircd%2Firc-oper.c;h=dd408a6fa8bd8c77869397ff8655efcee881bdf6;hp=80b9f9a4d1ff9ab1d346a22a497d5f2647ee1357;hb=37609d6a4f036b175fdc304d0ee466bd8ad57bf9;hpb=78c8212280127b421d4a8bb1094560441ffb7eef

diff --git a/src/ngircd/irc-oper.c b/src/ngircd/irc-oper.c
index 80b9f9a4..dd408a6f 100644
--- a/src/ngircd/irc-oper.c
+++ b/src/ngircd/irc-oper.c
@@ -48,8 +48,7 @@ Bad_OperPass(CLIENT *Client, char *errtoken, char *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,
+	return IRC_WriteErrClient(Client, ERR_PASSWDMISMATCH_MSG,
 				  Client_ID(Client));
 } /* Bad_OperPass */
 
@@ -120,15 +119,15 @@ IRC_DIE(CLIENT * Client, REQUEST * Req)
 	assert(Client != NULL);
 	assert(Req != NULL);
 
-	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
 
+	if (!Op_Check(Client, Req))
+		return Op_NoPrivileges(Client, Req);
+
 	/* Is a message given? */
 	if (Req->argc > 0) {
 		c = Conn_First();
@@ -163,11 +162,11 @@ IRC_REHASH( CLIENT *Client, REQUEST *Req )
 	assert( Client != NULL );
 	assert( Req != NULL );
 
+	_IRC_ARGC_EQ_OR_RETURN_(Client, Req, 0)
+
 	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));
@@ -192,14 +191,14 @@ IRC_RESTART( CLIENT *Client, REQUEST *Req )
 	assert( Client != NULL );
 	assert( Req != NULL );
 
-	if (!Op_Check(Client, Req))
-		return Op_NoPrivileges(Client, Req);
-
 	/* Bad number of parameters? */
 	if (Req->argc != 0)
-		return IRC_WriteStrClient(Client, ERR_NEEDMOREPARAMS_MSG,
+		return IRC_WriteErrClient(Client, ERR_NEEDMOREPARAMS_MSG,
 					  Client_ID(Client), Req->command);
 
+	if (!Op_Check(Client, Req))
+		return Op_NoPrivileges(Client, Req);
+
 	Log(LOG_NOTICE|LOG_snotice, "Got RESTART command from \"%s\" ...",
 	    Client_Mask(Client));
 	NGIRCd_SignalRestart = true;
@@ -222,21 +221,21 @@ 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)
-		return IRC_WriteStrClient(Client, ERR_NEEDMOREPARAMS_MSG,
+		return IRC_WriteErrClient(Client, ERR_NEEDMOREPARAMS_MSG,
 					  Client_ID(Client), Req->command);
 
 	/* Invalid port number? */
 	if ((Req->argc > 1) && atoi(Req->argv[1]) < 1)
-		return IRC_WriteStrClient(Client, ERR_NEEDMOREPARAMS_MSG,
+		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();
 
@@ -245,14 +244,14 @@ IRC_CONNECT(CLIENT * Client, REQUEST * Req)
 		if (Client_Type(Client) == CLIENT_SERVER && Req->prefix)
 			from = Client_Search(Req->prefix);
 		if (! from)
-			return IRC_WriteStrClient(Client, ERR_NOSUCHNICK_MSG,
-					Client_ID(Client), Req->prefix);
+			return IRC_WriteErrClient(Client, ERR_NOSUCHNICK_MSG,
+						  Client_ID(Client), Req->prefix);
 
 		target = (Req->argc == 3) ? Client_Search(Req->argv[2])
 					  : Client_Search(Req->argv[5]);
 		if (! target || Client_Type(target) != CLIENT_SERVER)
-			return IRC_WriteStrClient(from, ERR_NOSUCHSERVER_MSG,
-					Client_ID(from), Req->argv[0]);
+			return IRC_WriteErrClient(from, ERR_NOSUCHSERVER_MSG,
+						  Client_ID(from), Req->argv[0]);
 	}
 
 	if (target != Client_ThisServer()) {
@@ -275,7 +274,7 @@ IRC_CONNECT(CLIENT * Client, REQUEST * Req)
 	switch (Req->argc) {
 	case 1:
 		if (!Conf_EnablePassiveServer(Req->argv[0]))
-			return IRC_WriteStrClient(from, ERR_NOSUCHSERVER_MSG,
+			return IRC_WriteErrClient(from, ERR_NOSUCHSERVER_MSG,
 						  Client_ID(from),
 						  Req->argv[0]);
 		break;
@@ -284,7 +283,7 @@ IRC_CONNECT(CLIENT * Client, REQUEST * Req)
 		/* Connect configured server */
 		if (!Conf_EnableServer
 		    (Req->argv[0], (UINT16) atoi(Req->argv[1])))
-			return IRC_WriteStrClient(from, ERR_NOSUCHSERVER_MSG,
+			return IRC_WriteErrClient(from, ERR_NOSUCHSERVER_MSG,
 						  Client_ID(from),
 						  Req->argv[0]);
 		break;
@@ -293,7 +292,7 @@ IRC_CONNECT(CLIENT * Client, REQUEST * Req)
 		if (!Conf_AddServer
 		    (Req->argv[0], (UINT16) atoi(Req->argv[1]), Req->argv[2],
 		     Req->argv[3], Req->argv[4]))
-			return IRC_WriteStrClient(from, ERR_NOSUCHSERVER_MSG,
+			return IRC_WriteErrClient(from, ERR_NOSUCHSERVER_MSG,
 						  Client_ID(from),
 						  Req->argv[0]);
 	}
@@ -326,14 +325,14 @@ IRC_DISCONNECT(CLIENT * Client, REQUEST * Req)
 	assert(Client != NULL);
 	assert(Req != NULL);
 
-	if (!Op_Check(Client, Req))
-		return Op_NoPrivileges(Client, Req);
-
 	/* Bad number of parameters? */
 	if (Req->argc != 1)
-		return IRC_WriteStrClient(Client, ERR_NEEDMOREPARAMS_MSG,
+		return IRC_WriteErrClient(Client, ERR_NEEDMOREPARAMS_MSG,
 					  Client_ID(Client), Req->command);
 
+	if (!Op_Check(Client, Req))
+		return Op_NoPrivileges(Client, Req);
+
 	IRC_SendWallops(Client_ThisServer(), Client_ThisServer(),
 			"Received DISCONNECT %s from %s",
 			Req->argv[0], Client_ID(Client));
@@ -347,7 +346,7 @@ IRC_DISCONNECT(CLIENT * Client, REQUEST * Req)
 
 	/* Disconnect configured server */
 	if (!Conf_DisableServer(Req->argv[0]))
-		return IRC_WriteStrClient(Client, ERR_NOSUCHSERVER_MSG,
+		return IRC_WriteErrClient(Client, ERR_NOSUCHSERVER_MSG,
 					  Client_ID(Client), Req->argv[0]);
 
 	/* Are we still connected or were we killed, too? */
@@ -377,7 +376,7 @@ IRC_WALLOPS( CLIENT *Client, REQUEST *Req )
 	switch (Client_Type(Client)) {
 	case CLIENT_USER:
 		if (!Client_OperByMe(Client))
-			return IRC_WriteStrClient(Client, ERR_NOPRIVILEGES_MSG,
+			return IRC_WriteErrClient(Client, ERR_NOPRIVILEGES_MSG,
 						  Client_ID(Client));
 		from = Client;
 		break;
@@ -389,7 +388,7 @@ IRC_WALLOPS( CLIENT *Client, REQUEST *Req )
 	}
 
 	if (!from)
-		return IRC_WriteStrClient(Client, ERR_NOSUCHNICK_MSG,
+		return IRC_WriteErrClient(Client, ERR_NOSUCHNICK_MSG,
 					  Client_ID(Client), Req->prefix);
 
 	IRC_SendWallops(Client, from, "%s", Req->argv[0]);
@@ -413,15 +412,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_WriteStrClient(Client, ERR_NEEDMOREPARAMS_MSG,
+		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':