commit 6b58ab84272c53b13cdd6d40fb2cf21c734897bc from: Alexander Barton date: Wed Mar 27 20:52:58 2002 UTC - einige Log-Meldungen werden nun auch als Server Notice verschickt. commit - e9b98fefc608471c908f709078b442cf155d5b64 commit + 6b58ab84272c53b13cdd6d40fb2cf21c734897bc blob - 1d08f47650ff02106191207d859bb503d7d2fbd8 blob + 1b634e547f5d8007aedc2a36c58e7e61169c35ba --- src/ngircd/client.c +++ src/ngircd/client.c @@ -9,7 +9,7 @@ * Naehere Informationen entnehmen Sie bitter der Datei COPYING. Eine Liste * der an ngIRCd beteiligten Autoren finden Sie in der Datei AUTHORS. * - * $Id: client.c,v 1.52 2002/03/25 19:11:01 alex Exp $ + * $Id: client.c,v 1.53 2002/03/27 20:52:58 alex Exp $ * * client.c: Management aller Clients * @@ -245,8 +245,8 @@ GLOBAL VOID Client_Destroy( CLIENT *Client, CHAR *LogM { if( c != This_Server ) { - if( c->conn_id != NONE ) Log( LOG_NOTICE, "Server \"%s\" unregistered (connection %d): %s", c->id, c->conn_id, txt ); - else Log( LOG_NOTICE, "Server \"%s\" unregistered: %s", c->id, txt ); + if( c->conn_id != NONE ) Log( LOG_NOTICE|LOG_snotice, "Server \"%s\" unregistered (connection %d): %s", c->id, c->conn_id, txt ); + else Log( LOG_NOTICE|LOG_snotice, "Server \"%s\" unregistered: %s", c->id, txt ); } /* andere Server informieren */ blob - b390d080515ff21257055902703d4e16e25a5283 blob + 965015943d068c02046cb4795899f930d4a47f2f --- src/ngircd/irc-oper.c +++ src/ngircd/irc-oper.c @@ -9,7 +9,7 @@ * Naehere Informationen entnehmen Sie bitter der Datei COPYING. Eine Liste * der an ngIRCd beteiligten Autoren finden Sie in der Datei AUTHORS. * - * $Id: irc-oper.c,v 1.2 2002/03/12 14:37:52 alex Exp $ + * $Id: irc-oper.c,v 1.3 2002/03/27 20:52:58 alex Exp $ * * irc-oper.c: IRC-Operator-Befehle */ @@ -68,7 +68,7 @@ GLOBAL BOOLEAN IRC_OPER( CLIENT *Client, REQUEST *Req IRC_WriteStrServersPrefix( NULL, Client, "MODE %s :+o", Client_ID( Client )); } - if( ! Client_OperByMe( Client )) Log( LOG_NOTICE, "Got valid OPER from \"%s\", user is an IRC operator now.", Client_Mask( Client )); + if( ! Client_OperByMe( Client )) Log( LOG_NOTICE|LOG_snotice, "Got valid OPER from \"%s\", user is an IRC operator now.", Client_Mask( Client )); Client_SetOperByMe( Client, TRUE ); return IRC_WriteStrClient( Client, RPL_YOUREOPER_MSG, Client_ID( Client )); @@ -87,7 +87,7 @@ GLOBAL BOOLEAN IRC_DIE( CLIENT *Client, REQUEST *Req ) if(( ! Client_HasMode( Client, 'o' )) || ( ! Client_OperByMe( Client ))) return IRC_WriteStrClient( Client, ERR_NOPRIVILEGES_MSG, Client_ID( Client )); - Log( LOG_NOTICE, "Got DIE command from \"%s\", going down!", Client_Mask( Client )); + Log( LOG_NOTICE|LOG_snotice, "Got DIE command from \"%s\", going down!", Client_Mask( Client )); NGIRCd_Quit = TRUE; return CONNECTED; } /* IRC_DIE */ @@ -105,7 +105,7 @@ GLOBAL BOOLEAN IRC_RESTART( CLIENT *Client, REQUEST *R if(( ! Client_HasMode( Client, 'o' )) || ( ! Client_OperByMe( Client ))) return IRC_WriteStrClient( Client, ERR_NOPRIVILEGES_MSG, Client_ID( Client )); - Log( LOG_NOTICE, "Got RESTART command from \"%s\", going down!", Client_Mask( Client )); + Log( LOG_NOTICE|LOG_snotice, "Got RESTART command from \"%s\", going down!", Client_Mask( Client )); NGIRCd_Restart = TRUE; return CONNECTED; } /* IRC_RESTART */ blob - 6ea1d2681e1f05f0c32c380523e48ab256df2e27 blob + 743824c092272dad3f4070631fb6de88118e313e --- src/ngircd/irc-server.c +++ src/ngircd/irc-server.c @@ -9,7 +9,7 @@ * Naehere Informationen entnehmen Sie bitter der Datei COPYING. Eine Liste * der an ngIRCd beteiligten Autoren finden Sie in der Datei AUTHORS. * - * $Id: irc-server.c,v 1.7 2002/03/25 17:12:22 alex Exp $ + * $Id: irc-server.c,v 1.8 2002/03/27 20:52:58 alex Exp $ * * irc-server.c: IRC-Befehle fuer Server-Links */ @@ -97,7 +97,7 @@ GLOBAL BOOLEAN IRC_SERVER( CLIENT *Client, REQUEST *Re } else Client_SetToken( Client, atoi( Req->argv[1] )); - Log( LOG_NOTICE, "Server \"%s\" registered (connection %d, 1 hop - direct link).", Client_ID( Client ), Client_Conn( Client )); + Log( LOG_NOTICE|LOG_snotice, "Server \"%s\" registered (connection %d, 1 hop - direct link).", Client_ID( Client ), Client_Conn( Client )); Client_SetType( Client, CLIENT_SERVER ); @@ -222,7 +222,7 @@ GLOBAL BOOLEAN IRC_SERVER( CLIENT *Client, REQUEST *Re /* Log-Meldung zusammenbauen und ausgeben */ if(( Client_Hops( c ) > 1 ) && ( Req->prefix[0] )) sprintf( str, "connected to %s, ", Client_ID( from )); else strcpy( str, "" ); - Log( LOG_NOTICE, "Server \"%s\" registered (via %s, %s%d hop%s).", Client_ID( c ), Client_ID( Client ), str, Client_Hops( c ), Client_Hops( c ) > 1 ? "s": "" ); + Log( LOG_NOTICE|LOG_snotice, "Server \"%s\" registered (via %s, %s%d hop%s).", Client_ID( c ), Client_ID( Client ), str, Client_Hops( c ), Client_Hops( c ) > 1 ? "s": "" ); /* Andere Server informieren */ IRC_WriteStrServersPrefix( Client, from, "SERVER %s %d %d :%s", Client_ID( c ), Client_Hops( c ) + 1, Client_MyToken( c ), Client_Info( c ));