- Server Notices (User-Mode "s") implementiert.

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

diff --git a/src/ngircd/irc-server.c b/src/ngircd/irc-server.c
index db5772086ae2f8e7ff6274424e13068c42125470..743824c092272dad3f4070631fb6de88118e313e 100644 (file)
--- a/src/ngircd/irc-server.c
+++ b/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.6 2002/03/12 14:37:52 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 *Req )
                }
                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 );
 
@@ -200,7 +200,7 @@ GLOBAL BOOLEAN IRC_SERVER( CLIENT *Client, REQUEST *Req )
                ptr = strchr( Req->argv[3] + 2, '[' );
                if( ! ptr ) ptr = Req->argv[3];
 
-               from = Client_GetFromID( Req->prefix );
+               from = Client_Search( Req->prefix );
                if( ! from )
                {
                        /* Hm, Server, der diesen einfuehrt, ist nicht bekannt!? */
@@ -222,7 +222,7 @@ GLOBAL BOOLEAN IRC_SERVER( CLIENT *Client, REQUEST *Req )
                /* 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 ));
@@ -262,7 +262,7 @@ GLOBAL BOOLEAN IRC_NJOIN( CLIENT *Client, REQUEST *Req )
                        ptr++;
                }
 
-               c = Client_GetFromID( ptr );
+               c = Client_Search( ptr );
                if( c )
                {
                        Channel_Join( c, channame );
@@ -315,7 +315,7 @@ GLOBAL BOOLEAN IRC_SQUIT( CLIENT *Client, REQUEST *Req )
        /* SQUIT an alle Server weiterleiten */
        IRC_WriteStrServers( Client, "SQUIT %s :%s", Req->argv[0], Req->argv[1] );
 
-       target = Client_GetFromID( Req->argv[0] );
+       target = Client_Search( Req->argv[0] );
        if( ! target )
        {
                /* Den Server kennen wir nicht (mehr), also nichts zu tun. */