X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fngircd%2Firc-mode.c;h=a59f085d7f6d4fb9434a07dc7266368bee0240b7;hb=e73d70ce6fab3acdefe914520a4296acb6d50eac;hp=e2fa59a2df67aa5f306629e0b3db9030a26d7c1d;hpb=bcb45da1b416e7ee4b50dcf16947fb9703f713cf;p=ngircd-alex.git

diff --git a/src/ngircd/irc-mode.c b/src/ngircd/irc-mode.c
index e2fa59a2..a59f085d 100644
--- a/src/ngircd/irc-mode.c
+++ b/src/ngircd/irc-mode.c
@@ -223,11 +223,12 @@ Client_Mode( CLIENT *Client, REQUEST *Req, CLIENT *Origin, CLIENT *Target )
 			else
 				x[0] = 'B';
 			break;
-		case 'c': /* Receive connect notices
-			   * (only settable by IRC operators!) */
+		case 'c': /* Receive connect notices */
+		case 'q': /* KICK-protected user */
+			  /* (only settable by IRC operators!) */
 			if (!set || Client_Type(Client) == CLIENT_SERVER
-			    || Client_OperByMe(Origin))
-				x[0] = 'c';
+			    || Client_HasMode(Origin, 'o'))
+				x[0] = *mode_ptr;
 			else
 				ok = IRC_WriteErrClient(Origin,
 							ERR_NOPRIVILEGES_MSG,
@@ -235,22 +236,12 @@ Client_Mode( CLIENT *Client, REQUEST *Req, CLIENT *Origin, CLIENT *Target )
 			break;
 		case 'o': /* IRC operator (only unsettable!) */
 			if (!set || Client_Type(Client) == CLIENT_SERVER) {
-				Client_SetOperByMe(Target, false);
 				x[0] = 'o';
 			} else
 				ok = IRC_WriteErrClient(Origin,
 							ERR_NOPRIVILEGES_MSG,
 							Client_ID(Origin));
 			break;
-		case 'q': /* KICK-protected user */
-			if (!set || Client_Type(Client) == CLIENT_SERVER
-			    || Client_OperByMe(Origin))
-				x[0] = 'q';
-			else
-				ok = IRC_WriteErrClient(Origin,
-							ERR_NOPRIVILEGES_MSG,
-							Client_ID(Origin));
-			break;
 		case 'r': /* Restricted (only settable) */
 			if (set || Client_Type(Client) == CLIENT_SERVER)
 				x[0] = 'r';
@@ -274,7 +265,7 @@ Client_Mode( CLIENT *Client, REQUEST *Req, CLIENT *Origin, CLIENT *Target )
 							Client_ID(Origin));
 			else if (!set || Conf_CloakHostModeX[0]
 				 || Client_Type(Client) == CLIENT_SERVER
-				 || Client_OperByMe(Client)) {
+				 || Client_HasMode(Origin, 'o')) {
 				x[0] = 'x';
 				send_RPL_HOSTHIDDEN_MSG = true;
 			} else
@@ -366,7 +357,6 @@ Client_Mode( CLIENT *Client, REQUEST *Req, CLIENT *Origin, CLIENT *Target )
 			 Client_Modes(Target));
 	}
 
-	IRC_SetPenalty(Client, 1);
 	return ok;
 } /* Client_Mode */
 
@@ -455,7 +445,7 @@ Channel_Mode(CLIENT *Client, REQUEST *Req, CLIENT *Origin, CHANNEL *Channel)
 
 	/* Check if origin is oper and opers can use mode */
 	use_servermode = Conf_OperServerMode;
-	if(Client_OperByMe(Client) && Conf_OperCanMode) {
+	if(Client_HasMode(Client, 'o') && Conf_OperCanMode) {
 		is_oper = true;
 	}
 
@@ -592,9 +582,13 @@ Channel_Mode(CLIENT *Client, REQUEST *Req, CLIENT *Origin, CHANNEL *Channel)
 				goto chan_exit;
 			if (!set) {
 				if (is_oper || is_machine || is_owner ||
-				    is_admin || is_op || is_halfop)
+				    is_admin || is_op || is_halfop) {
 					x[0] = *mode_ptr;
-				else
+					if (Channel_HasMode(Channel, 'k'))
+						strlcpy(argadd, "*", sizeof(argadd));
+					if (arg_arg > mode_arg)
+						arg_arg++;
+				} else
 					connected = IRC_WriteErrClient(Origin,
 						ERR_CHANOPRIVSNEEDED_MSG,
 						Client_ID(Origin),
@@ -622,7 +616,6 @@ Channel_Mode(CLIENT *Client, REQUEST *Req, CLIENT *Origin, CHANNEL *Channel)
 #ifdef STRICT_RFC
 				/* Only send error message in "strict" mode,
 				 * this is how ircd2.11 and others behave ... */
-				IRC_SetPenalty(Origin, 2);
 				connected = IRC_WriteErrClient(Origin,
 					ERR_NEEDMOREPARAMS_MSG,
 					Client_ID(Origin), Req->command);
@@ -667,7 +660,6 @@ Channel_Mode(CLIENT *Client, REQUEST *Req, CLIENT *Origin, CHANNEL *Channel)
 #ifdef STRICT_RFC
 				/* Only send error message in "strict" mode,
 				 * this is how ircd2.11 and others behave ... */
-				IRC_SetPenalty(Origin, 2);
 				connected = IRC_WriteErrClient(Origin,
 					ERR_NEEDMOREPARAMS_MSG,
 					Client_ID(Origin), Req->command);
@@ -769,7 +761,6 @@ Channel_Mode(CLIENT *Client, REQUEST *Req, CLIENT *Origin, CHANNEL *Channel)
 				 * mode, because most other servers don't do
 				 * it as well and some clients send "wired"
 				 * MODE commands like "MODE #chan -ooo nick". */
-				IRC_SetPenalty(Origin, 2);
 				connected = IRC_WriteErrClient(Origin,
 					ERR_NEEDMOREPARAMS_MSG,
 					Client_ID(Origin), Req->command);
@@ -930,7 +921,6 @@ Channel_Mode(CLIENT *Client, REQUEST *Req, CLIENT *Origin, CHANNEL *Channel)
 		}
 	}
 
-	IRC_SetPenalty(Client, 1);
 	return connected;
 } /* Channel_Mode */