X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?p=ngircd-alex.git;a=blobdiff_plain;f=src%2Fngircd%2Firc-mode.c;h=c5eeadfb5e87938e29fbb2a6c268529f918c5af1;hp=148698ac48096ab562fb28f393e9eaea968e53d6;hb=6626395c88fc46eeb110942b17eb9245a1d0021b;hpb=69ad0e386e064bf95fc77d179f88d3ae04405d30

diff --git a/src/ngircd/irc-mode.c b/src/ngircd/irc-mode.c
index 148698ac..c5eeadfb 100644
--- a/src/ngircd/irc-mode.c
+++ b/src/ngircd/irc-mode.c
@@ -14,7 +14,7 @@
 
 #include "portab.h"
 
-static char UNUSED id[] = "$Id: irc-mode.c,v 1.23 2002/12/16 23:06:46 alex Exp $";
+static char UNUSED id[] = "$Id: irc-mode.c,v 1.25 2002/12/26 16:48:14 alex Exp $";
 
 #include "imp.h"
 #include <assert.h>
@@ -142,7 +142,8 @@ Client_Mode( CLIENT *Client, REQUEST *Req, CLIENT *Origin, CLIENT *Target )
 					else
 					{
 						/* Append modifier character to result string */
-						x[0] = *mode_ptr; strcat( the_modes, x );
+						x[0] = *mode_ptr;
+						strlcat( the_modes, x, sizeof( the_modes ));
 					}
 					if( *mode_ptr == '+' ) set = TRUE;
 					else set = FALSE;
@@ -154,13 +155,18 @@ Client_Mode( CLIENT *Client, REQUEST *Req, CLIENT *Origin, CLIENT *Target )
 		x[0] = '\0';
 		switch( *mode_ptr )
 		{
+			case 'a':
+				/* Away */
+				if( Client_Type( Client ) == CLIENT_SERVER ) x[0] = 'a';
+				else ok = IRC_WriteStrClient( Origin, ERR_NOPRIVILEGES_MSG, Client_ID( Origin ));
+				break;
 			case 'i':
 				/* Invisible */
 				x[0] = 'i';
 				break;
 			case 'o':
 				/* IRC operator (only unsetable!) */
-				if( ! set )
+				if(( ! set ) || ( Client_Type( Client ) == CLIENT_SERVER ))
 				{
 					Client_SetOperByMe( Target, FALSE );
 					x[0] = 'o';
@@ -169,7 +175,7 @@ Client_Mode( CLIENT *Client, REQUEST *Req, CLIENT *Origin, CLIENT *Target )
 				break;
 			case 'r':
 				/* Restricted (only setable) */
-				if( set ) x[0] = 'r';
+				if(( set ) || ( Client_Type( Client ) == CLIENT_SERVER )) x[0] = 'r';
 				else ok = IRC_WriteStrClient( Origin, ERR_RESTRICTED_MSG, Client_ID( Origin ));
 				break;
 			case 's':
@@ -190,13 +196,13 @@ Client_Mode( CLIENT *Client, REQUEST *Req, CLIENT *Origin, CLIENT *Target )
 		if( set )
 		{
 			/* Set mode */
-			if( Client_ModeAdd( Target, x[0] )) strcat( the_modes, x );
+			if( Client_ModeAdd( Target, x[0] )) strlcat( the_modes, x, sizeof( the_modes ));
 
 		}
 		else
 		{
 			/* Unset mode */
-			if( Client_ModeDel( Target, x[0] )) strcat( the_modes, x );
+			if( Client_ModeDel( Target, x[0] )) strlcat( the_modes, x, sizeof( the_modes ));
 		}		
 	}
 client_exit:
@@ -300,7 +306,8 @@ Channel_Mode( CLIENT *Client, REQUEST *Req, CLIENT *Origin, CHANNEL *Channel )
 					else
 					{
 						/* Append modifier character to result string */
-						x[0] = *mode_ptr; strcat( the_modes, x );
+						x[0] = *mode_ptr;
+						strlcat( the_modes, x, sizeof( the_modes ));
 					}
 					if( *mode_ptr == '+' ) set = TRUE;
 					else set = FALSE;
@@ -475,8 +482,9 @@ Channel_Mode( CLIENT *Client, REQUEST *Req, CLIENT *Origin, CHANNEL *Channel )
 				/* Channel-User-Mode */
 				if( Channel_UserModeAdd( Channel, client, x[0] ))
 				{
-					strcat( the_args, Client_ID( client ));
-					strcat( the_args, " " ); strcat( the_modes, x );
+					strlcat( the_args, Client_ID( client ), sizeof( the_args ));
+					strlcat( the_args, " ", sizeof( the_args ));
+					strlcat( the_modes, x, sizeof( the_modes ));
 					Log( LOG_DEBUG, "User \"%s\": Mode change on %s, now \"%s\"", Client_Mask( client ), Channel_Name( Channel ), Channel_UserModes( Channel, client ));
 				}
 			}
@@ -485,7 +493,7 @@ Channel_Mode( CLIENT *Client, REQUEST *Req, CLIENT *Origin, CHANNEL *Channel )
 				/* Channel-Mode */
 				if( Channel_ModeAdd( Channel, x[0] ))
 				{
-					strcat( the_modes, x );
+					strlcat( the_modes, x, sizeof( the_modes ));
 					Log( LOG_DEBUG, "Channel %s: Mode change, now \"%s\".", Channel_Name( Channel ), Channel_Modes( Channel ));
 				}
 			}
@@ -498,8 +506,9 @@ Channel_Mode( CLIENT *Client, REQUEST *Req, CLIENT *Origin, CHANNEL *Channel )
 				/* Channel-User-Mode */
 				if( Channel_UserModeDel( Channel, client, x[0] ))
 				{
-					strcat( the_args, Client_ID( client ));
-					strcat( the_args, " " ); strcat( the_modes, x );
+					strlcat( the_args, Client_ID( client ), sizeof( the_args ));
+					strlcat( the_args, " ", sizeof( the_args ));
+					strlcat( the_modes, x, sizeof( the_modes ));
 					Log( LOG_DEBUG, "User \"%s\": Mode change on %s, now \"%s\"", Client_Mask( client ), Channel_Name( Channel ), Channel_UserModes( Channel, client ));
 				}
 			}
@@ -508,7 +517,7 @@ Channel_Mode( CLIENT *Client, REQUEST *Req, CLIENT *Origin, CHANNEL *Channel )
 				/* Channel-Mode */
 				if( Channel_ModeDel( Channel, x[0] ))
 				{
-					strcat( the_modes, x );
+					strlcat( the_modes, x, sizeof( the_modes ));
 					Log( LOG_DEBUG, "Channel %s: Mode change, now \"%s\".", Channel_Name( Channel ), Channel_Modes( Channel ));
 				}
 			}
@@ -517,8 +526,8 @@ Channel_Mode( CLIENT *Client, REQUEST *Req, CLIENT *Origin, CHANNEL *Channel )
 		/* Are there additional arguments to add? */
 		if( argadd[0] )
 		{
-			if( the_args[strlen( the_args ) - 1] != ' ' ) strcat( the_args, " " );
-			strcat( the_args, argadd );
+			if( the_args[strlen( the_args ) - 1] != ' ' ) strlcat( the_args, " ", sizeof( the_args ));
+			strlcat( the_args, argadd, sizeof( the_args ));
 		}
 	}
 chan_exit: