- JOIN: Invite- und Ban-Lists werden nun beachtet.

[ngircd-alex.git] / src / ngircd / client.c

diff --git a/src/ngircd/client.c b/src/ngircd/client.c
index 3c6d3aebfbc596cd7a38cfe202a15c354e9bec6f..9cb472915bddaa19d98654604184fea33143e751 100644 (file)
--- a/src/ngircd/client.c
+++ b/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.55 2002/05/27 13:09:26 alex Exp $
+ * $Id: client.c,v 1.57 2002/06/01 14:36:43 alex Exp $
  *
  * client.c: Management aller Clients
  *
@@ -73,7 +73,7 @@ Client_Init( VOID )
        if( ! This_Server )
        {
                Log( LOG_EMERG, "Can't allocate client structure for server! Going down." );
-               Log( LOG_ALERT, PACKAGE" exiting due to fatal errors!" );
+               Log( LOG_ALERT, "%s exiting due to fatal errors!", PACKAGE );
                exit( 1 );
        }
 
@@ -249,7 +249,7 @@ Client_Destroy( CLIENT *Client, CHAR *LogMsg, CHAR *FwdMsg, BOOLEAN SendQuit )
                                                else IRC_WriteStrServersPrefix( Client_NextHop( c ), c, "QUIT :" );
                                        }
                                }
-                               Channel_RemoveClient( c, FwdMsg ? FwdMsg : c->id );
+                               Channel_Quit( c, FwdMsg ? FwdMsg : c->id );
                        }
                        else if( c->type == CLIENT_SERVER )
                        {
@@ -906,10 +906,12 @@ Client_IsValidNick( CHAR *Nick )
 {
        /* Ist der Nick gueltig? */
 
-       CHAR *ptr, goodchars[] = ";0123456789-";
+       CHAR *ptr, goodchars[20];
        
        assert( Nick != NULL );
 
+       strcpy( goodchars, ";0123456789-" );
+
        if( Nick[0] == '#' ) return FALSE;
        if( strchr( goodchars, Nick[0] )) return FALSE;
        if( strlen( Nick ) >= CLIENT_NICK_LEN ) return FALSE;