X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fngircd%2Firc-login.c;h=c20621d67c304e4b04501530732b6fdbbc30437c;hb=77f54693ef258b1fe65ee105fc026dfb2c6257dc;hp=cd3fcc61784f1207010dc39d840e9286a80bdc4f;hpb=55ee4c9553b2c6e6361fbdab39ee31c74608e871;p=ngircd-alex.git diff --git a/src/ngircd/irc-login.c b/src/ngircd/irc-login.c index cd3fcc61..c20621d6 100644 --- a/src/ngircd/irc-login.c +++ b/src/ngircd/irc-login.c @@ -2,48 +2,50 @@ * ngIRCd -- The Next Generation IRC Daemon * Copyright (c)2001,2002 by Alexander Barton (alex@barton.de) * - * Dieses Programm ist freie Software. Sie koennen es unter den Bedingungen - * der GNU General Public License (GPL), wie von der Free Software Foundation - * herausgegeben, weitergeben und/oder modifizieren, entweder unter Version 2 - * der Lizenz oder (wenn Sie es wuenschen) jeder spaeteren Version. - * Naehere Informationen entnehmen Sie bitter der Datei COPYING. Eine Liste - * der an ngIRCd beteiligten Autoren finden Sie in der Datei AUTHORS. + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * Please read the file COPYING, README and AUTHORS for more information. * - * $Id: irc-login.c,v 1.20 2002/09/03 20:58:43 alex Exp $ - * - * irc-login.c: Anmeldung und Abmeldung im IRC + * Login and logout */ #include "portab.h" +static char UNUSED id[] = "$Id: irc-login.c,v 1.46 2005/07/31 20:13:08 alex Exp $"; + #include "imp.h" #include #include #include #include +#include #include "ngircd.h" #include "resolve.h" +#include "conn-func.h" #include "conf.h" -#include "conn.h" #include "client.h" #include "channel.h" #include "log.h" #include "messages.h" #include "parse.h" #include "irc.h" +#include "irc-info.h" #include "irc-write.h" +#include "cvs-version.h" #include "exp.h" #include "irc-login.h" -LOCAL BOOLEAN Hello_User PARAMS(( CLIENT *Client )); -LOCAL VOID Kill_Nick PARAMS(( CHAR *Nick, CHAR *Reason )); +static bool Hello_User PARAMS(( CLIENT *Client )); +static void Kill_Nick PARAMS(( char *Nick, char *Reason )); -GLOBAL BOOLEAN +GLOBAL bool IRC_PASS( CLIENT *Client, REQUEST *Req ) { assert( Client != NULL ); @@ -65,8 +67,8 @@ IRC_PASS( CLIENT *Client, REQUEST *Req ) } else if((( Client_Type( Client ) == CLIENT_UNKNOWN ) || ( Client_Type( Client ) == CLIENT_UNKNOWNSERVER )) && (( Req->argc == 3 ) || ( Req->argc == 4 ))) { - CHAR c2, c4, *type, *impl, *serverver, *flags, *ptr; - INT protohigh, protolow; + char c2, c4, *type, *impl, *serverver, *flags, *ptr, *ircflags; + int protohigh, protolow; /* noch nicht registrierte Server-Verbindung */ Log( LOG_DEBUG, "Connection %d: got PASS command (new server link) ...", Client_Conn( Client )); @@ -94,6 +96,10 @@ IRC_PASS( CLIENT *Client, REQUEST *Req ) if( strlen( Req->argv[1] ) > 4 ) type = &Req->argv[1][4]; else type = NULL; + /* IRC-Flags (nach RFC 2813) */ + if( Req->argc >= 4 ) ircflags = Req->argv[3]; + else ircflags = ""; + /* Implementation, Version und ngIRCd-Flags */ impl = Req->argv[2]; ptr = strchr( impl, '|' ); @@ -111,12 +117,16 @@ IRC_PASS( CLIENT *Client, REQUEST *Req ) flags++; } else flags = ""; - Log( LOG_INFO, "Connection %d: Peer announces itself as %s-%s (flags: \"%s\") using protocol version %d.%d+.", Client_Conn( Client ), impl, serverver, flags, protohigh, protolow ); + Log( LOG_INFO, "Peer announces itself as %s-%s using protocol %d.%d/IRC+ (flags: \"%s\").", impl, serverver, protohigh, protolow, flags ); } else { - serverver = flags = ""; - Log( LOG_INFO, "Connection %d: Peer announces itself as \"%s\" using protocol version %d.%d.", Client_Conn( Client ), impl, protohigh, protolow ); + /* auf der anderen Seite laeuft ein Server, der + * nur das Originalprotokoll unterstuetzt */ + serverver = ""; + if( strchr( ircflags, 'Z' )) flags = "Z"; + else flags = ""; + Log( LOG_INFO, "Peer announces itself as \"%s\" using protocol %d.%d (flags: \"%s\").", impl, protohigh, protolow, flags ); } Client_SetType( Client, CLIENT_GOTPASSSERVER ); @@ -133,95 +143,146 @@ IRC_PASS( CLIENT *Client, REQUEST *Req ) } /* IRC_PASS */ -GLOBAL BOOLEAN +/** + * IRC "NICK" command. + * This function implements the IRC command "NICK" which is used to register + * with the server, to change already registered nicknames and to introduce + * new users which are connected to other servers. + */ +GLOBAL bool IRC_NICK( CLIENT *Client, REQUEST *Req ) { CLIENT *intr_c, *target, *c; - CHAR *modes; + char *modes; assert( Client != NULL ); assert( Req != NULL ); - /* Zumindest BitchX sendet NICK-USER in der falschen Reihenfolge. */ #ifndef STRICT_RFC - if( Client_Type( Client ) == CLIENT_UNKNOWN || Client_Type( Client ) == CLIENT_GOTPASS || Client_Type( Client ) == CLIENT_GOTNICK || Client_Type( Client ) == CLIENT_GOTUSER || Client_Type( Client ) == CLIENT_USER || ( Client_Type( Client ) == CLIENT_SERVER && Req->argc == 1 )) + /* Some IRC clients, for example BitchX, send the NICK and USER + * commands in the wrong order ... */ + if( Client_Type( Client ) == CLIENT_UNKNOWN + || Client_Type( Client ) == CLIENT_GOTPASS + || Client_Type( Client ) == CLIENT_GOTNICK + || Client_Type( Client ) == CLIENT_GOTUSER + || Client_Type( Client ) == CLIENT_USER + || ( Client_Type( Client ) == CLIENT_SERVER && Req->argc == 1 )) #else - if( Client_Type( Client ) == CLIENT_UNKNOWN || Client_Type( Client ) == CLIENT_GOTPASS || Client_Type( Client ) == CLIENT_GOTNICK || Client_Type( Client ) == CLIENT_USER || ( Client_Type( Client ) == CLIENT_SERVER && Req->argc == 1 )) + if( Client_Type( Client ) == CLIENT_UNKNOWN + || Client_Type( Client ) == CLIENT_GOTPASS + || Client_Type( Client ) == CLIENT_GOTNICK + || Client_Type( Client ) == CLIENT_USER + || ( Client_Type( Client ) == CLIENT_SERVER && Req->argc == 1 )) #endif { - /* User-Registrierung bzw. Nick-Aenderung */ + /* User registration or change of nickname */ - /* Falsche Anzahl Parameter? */ - if( Req->argc != 1 ) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command ); + /* Wrong number of arguments? */ + if( Req->argc != 1 ) + return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, + Client_ID( Client ), + Req->command ); - /* "Ziel-Client" ermitteln */ + /* Search "target" client */ if( Client_Type( Client ) == CLIENT_SERVER ) { target = Client_Search( Req->prefix ); - if( ! target ) return IRC_WriteStrClient( Client, ERR_NOSUCHNICK_MSG, Client_ID( Client ), Req->argv[0] ); + if( ! target ) + return IRC_WriteStrClient( Client, + ERR_NOSUCHNICK_MSG, + Client_ID( Client ), + Req->argv[0] ); } else { - /* Ist der Client "restricted"? */ - if( Client_HasMode( Client, 'r' )) return IRC_WriteStrClient( Client, ERR_RESTRICTED_MSG, Client_ID( Client )); + /* Is this a restricted client? */ + if( Client_HasMode( Client, 'r' )) + return IRC_WriteStrClient( Client, + ERR_RESTRICTED_MSG, + Client_ID( Client )); + target = Client; } #ifndef STRICT_RFC - /* Wenn der Client zu seinem eigenen Nick wechseln will, so machen - * wir nichts. So macht es das Original und mind. Snak hat probleme, - * wenn wir es nicht so machen. Ob es so okay ist? Hm ... */ - if( strcmp( Client_ID( target ), Req->argv[0] ) == 0 ) return CONNECTED; + /* If the clients tries to change to its own nickname we won't + * do anything. This is how the original ircd behaves and some + * clients (for example Snak) expect it to be like this. + * But I doubt that this is "really the right thing" ... */ + if( strcmp( Client_ID( target ), Req->argv[0] ) == 0 ) + return CONNECTED; #endif - /* pruefen, ob Nick bereits vergeben. Speziallfall: der Client - * will nur die Gross- und Kleinschreibung aendern. Das darf - * er natuerlich machen :-) */ + /* Check that the new nickname is available. Special case: + * the client only changes from/to upper to lower case. */ if( strcasecmp( Client_ID( target ), Req->argv[0] ) != 0 ) { - if( ! Client_CheckNick( target, Req->argv[0] )) return CONNECTED; + if( ! Client_CheckNick( target, Req->argv[0] )) + return CONNECTED; } - if(( Client_Type( target ) != CLIENT_USER ) && ( Client_Type( target ) != CLIENT_SERVER )) + if(( Client_Type( target ) != CLIENT_USER ) + && ( Client_Type( target ) != CLIENT_SERVER )) { - /* Neuer Client */ - Log( LOG_DEBUG, "Connection %d: got valid NICK command ...", Client_Conn( Client )); + /* New client */ + Log( LOG_DEBUG, "Connection %d: got valid NICK command ...", + Client_Conn( Client )); - /* Client-Nick registrieren */ + /* Register new nickname of this client */ Client_SetID( target, Req->argv[0] ); - /* schon ein USER da? Dann registrieren! */ - if( Client_Type( Client ) == CLIENT_GOTUSER ) return Hello_User( Client ); - else Client_SetType( Client, CLIENT_GOTNICK ); + /* If we received a valid USER command already then + * register the new client! */ + if( Client_Type( Client ) == CLIENT_GOTUSER ) + return Hello_User( Client ); + else + Client_SetType( Client, CLIENT_GOTNICK ); } else { - /* Nick-Aenderung */ + /* Nickname change */ if( Client_Conn( target ) > NONE ) { - /* lokaler Client */ - Log( LOG_INFO, "User \"%s\" changed nick (connection %d): \"%s\" -> \"%s\".", Client_Mask( target ), Client_Conn( target ), Client_ID( target ), Req->argv[0] ); + /* Local client */ + Log( LOG_INFO, + "User \"%s\" changed nick (connection %d): \"%s\" -> \"%s\".", + Client_Mask( target ), Client_Conn( target ), + Client_ID( target ), Req->argv[0] ); } else { - /* Remote-Client */ - Log( LOG_DEBUG, "User \"%s\" changed nick: \"%s\" -> \"%s\".", Client_Mask( target ), Client_ID( target ), Req->argv[0] ); + /* Remote client */ + Log( LOG_DEBUG, + "User \"%s\" changed nick: \"%s\" -> \"%s\".", + Client_Mask( target ), Client_ID( target ), + Req->argv[0] ); } - /* alle betroffenen User und Server ueber Nick-Aenderung informieren */ - if( Client_Type( Client ) == CLIENT_USER ) IRC_WriteStrClientPrefix( Client, Client, "NICK :%s", Req->argv[0] ); - IRC_WriteStrServersPrefix( Client, target, "NICK :%s", Req->argv[0] ); - IRC_WriteStrRelatedPrefix( target, target, FALSE, "NICK :%s", Req->argv[0] ); + /* Inform all users and servers (which have to know) + * of this nickname change */ + if( Client_Type( Client ) == CLIENT_USER ) + IRC_WriteStrClientPrefix( Client, Client, + "NICK :%s", + Req->argv[0] ); + IRC_WriteStrServersPrefix( Client, target, + "NICK :%s", Req->argv[0] ); + IRC_WriteStrRelatedPrefix( target, target, false, + "NICK :%s", Req->argv[0] ); - /* neuen Client-Nick speichern */ + /* Register old nickname for WHOWAS queries */ + Client_RegisterWhowas( target ); + + /* Save new nickname */ Client_SetID( target, Req->argv[0] ); + + IRC_SetPenalty( target, 2 ); } return CONNECTED; } else if( Client_Type( Client ) == CLIENT_SERVER ) { - /* Server fuehrt neuen Client ein */ + /* Server introduces new client */ /* Falsche Anzahl Parameter? */ if( Req->argc != 7 ) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command ); @@ -248,7 +309,7 @@ IRC_NICK( CLIENT *Client, REQUEST *Req ) } /* Neue Client-Struktur anlegen */ - c = Client_NewRemoteUser( intr_c, Req->argv[0], atoi( Req->argv[1] ), Req->argv[2], Req->argv[3], atoi( Req->argv[4] ), Req->argv[5] + 1, Req->argv[6], TRUE ); + c = Client_NewRemoteUser( intr_c, Req->argv[0], atoi( Req->argv[1] ), Req->argv[2], Req->argv[3], atoi( Req->argv[4] ), Req->argv[5] + 1, Req->argv[6], true); if( ! c ) { /* Eine neue Client-Struktur konnte nicht angelegt werden. @@ -272,9 +333,13 @@ IRC_NICK( CLIENT *Client, REQUEST *Req ) } /* IRC_NICK */ -GLOBAL BOOLEAN +GLOBAL bool IRC_USER( CLIENT *Client, REQUEST *Req ) { +#ifdef IDENTAUTH + char *ptr; +#endif + assert( Client != NULL ); assert( Req != NULL ); @@ -284,11 +349,21 @@ IRC_USER( CLIENT *Client, REQUEST *Req ) if( Client_Type( Client ) == CLIENT_GOTNICK || Client_Type( Client ) == CLIENT_GOTPASS ) #endif { - /* Falsche Anzahl Parameter? */ + /* Wrong number of parameters? */ if( Req->argc != 4 ) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command ); - Client_SetUser( Client, Req->argv[0], FALSE ); - Client_SetInfo( Client, Req->argv[3] ); + /* User name */ +#ifdef IDENTAUTH + ptr = Client_User( Client ); + if( ! ptr || ! *ptr || *ptr == '~' ) Client_SetUser( Client, Req->argv[0], false ); +#else + Client_SetUser( Client, Req->argv[0], false ); +#endif + + /* "Real name" or user info text: Don't set it to the empty string, the original ircd + * can't deal with such "real names" (e. g. "USER user * * :") ... */ + if( *Req->argv[3] ) Client_SetInfo( Client, Req->argv[3] ); + else Client_SetInfo( Client, "-" ); Log( LOG_DEBUG, "Connection %d: got valid USER command ...", Client_Conn( Client )); if( Client_Type( Client ) == CLIENT_GOTNICK ) return Hello_User( Client ); @@ -303,21 +378,25 @@ IRC_USER( CLIENT *Client, REQUEST *Req ) } /* IRC_USER */ -GLOBAL BOOLEAN +GLOBAL bool IRC_QUIT( CLIENT *Client, REQUEST *Req ) { CLIENT *target; + char quitmsg[LINE_LEN]; assert( Client != NULL ); assert( Req != NULL ); + + /* Wrong number of arguments? */ + if( Req->argc > 1 ) + return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command ); + + if (Req->argc == 1) + strlcpy(quitmsg, Req->argv[0], sizeof quitmsg); if ( Client_Type( Client ) == CLIENT_SERVER ) { /* Server */ - - /* Falsche Anzahl Parameter? */ - if( Req->argc > 1 ) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command ); - target = Client_Search( Req->prefix ); if( ! target ) { @@ -326,27 +405,28 @@ IRC_QUIT( CLIENT *Client, REQUEST *Req ) return CONNECTED; } - if( Req->argc == 0 ) Client_Destroy( target, "Got QUIT command.", NULL, TRUE ); - else Client_Destroy( target, "Got QUIT command.", Req->argv[0], TRUE ); + Client_Destroy( target, "Got QUIT command.", Req->argc == 1 ? quitmsg : NULL, true); return CONNECTED; } else { - /* User, Service, oder noch nicht registriert */ - - /* Falsche Anzahl Parameter? */ - if( Req->argc > 1 ) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command ); + if (Req->argc == 1 && quitmsg[0] != '\"') { + /* " " to avoid confusion */ + strlcpy(quitmsg, "\"", sizeof quitmsg); + strlcat(quitmsg, Req->argv[0], sizeof quitmsg-1); + strlcat(quitmsg, "\"", sizeof quitmsg ); + } - if( Req->argc == 0 ) Conn_Close( Client_Conn( Client ), "Got QUIT command.", NULL, TRUE ); - else Conn_Close( Client_Conn( Client ), "Got QUIT command.", Req->argv[0], TRUE ); + /* User, Service, oder noch nicht registriert */ + Conn_Close( Client_Conn( Client ), "Got QUIT command.", Req->argc == 1 ? quitmsg : NULL, true); return DISCONNECTED; } } /* IRC_QUIT */ -GLOBAL BOOLEAN +GLOBAL bool IRC_PING( CLIENT *Client, REQUEST *Req ) { CLIENT *target, *from; @@ -354,8 +434,6 @@ IRC_PING( CLIENT *Client, REQUEST *Req ) assert( Client != NULL ); assert( Req != NULL ); - if(( Client_Type( Client ) != CLIENT_USER ) && ( Client_Type( Client ) != CLIENT_SERVER )) return IRC_WriteStrClient( Client, ERR_NOTREGISTERED_MSG, Client_ID( Client )); - /* Falsche Anzahl Parameter? */ if( Req->argc < 1 ) return IRC_WriteStrClient( Client, ERR_NOORIGIN_MSG, Client_ID( Client )); #ifdef STRICT_RFC @@ -366,7 +444,7 @@ IRC_PING( CLIENT *Client, REQUEST *Req ) { /* es wurde ein Ziel-Client angegeben */ target = Client_Search( Req->argv[1] ); - if( ! target ) return IRC_WriteStrClient( Client, ERR_NOSUCHSERVER_MSG, Client_ID( Client ), Req->argv[1] ); + if(( ! target ) || ( Client_Type( target ) != CLIENT_SERVER )) return IRC_WriteStrClient( Client, ERR_NOSUCHSERVER_MSG, Client_ID( Client ), Req->argv[1] ); if( target != Client_ThisServer( )) { /* ok, forwarden */ @@ -382,7 +460,7 @@ IRC_PING( CLIENT *Client, REQUEST *Req ) } /* IRC_PING */ -GLOBAL BOOLEAN +GLOBAL bool IRC_PONG( CLIENT *Client, REQUEST *Req ) { CLIENT *target, *from; @@ -390,8 +468,6 @@ IRC_PONG( CLIENT *Client, REQUEST *Req ) assert( Client != NULL ); assert( Req != NULL ); - if(( Client_Type( Client ) != CLIENT_USER ) && ( Client_Type( Client ) != CLIENT_SERVER )) return IRC_WriteStrClient( Client, ERR_NOTREGISTERED_MSG, Client_ID( Client )); - /* Falsche Anzahl Parameter? */ if( Req->argc < 1 ) return IRC_WriteStrClient( Client, ERR_NOORIGIN_MSG, Client_ID( Client )); if( Req->argc > 2 ) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command ); @@ -400,7 +476,7 @@ IRC_PONG( CLIENT *Client, REQUEST *Req ) if( Req->argc == 2 ) { target = Client_Search( Req->argv[1] ); - if( ! target ) return IRC_WriteStrClient( Client, ERR_NOSUCHSERVER_MSG, Client_ID( Client ), Req->argv[1] ); + if(( ! target ) || ( Client_Type( target ) != CLIENT_SERVER )) return IRC_WriteStrClient( Client, ERR_NOSUCHSERVER_MSG, Client_ID( Client ), Req->argv[1] ); if( target != Client_ThisServer( )) { /* ok, forwarden */ @@ -421,55 +497,81 @@ IRC_PONG( CLIENT *Client, REQUEST *Req ) } /* IRC_PONG */ -LOCAL BOOLEAN +static bool Hello_User( CLIENT *Client ) { +#ifdef CVSDATE + char ver[12], vertxt[30]; +#endif + assert( Client != NULL ); - /* Passwort ueberpruefen */ + /* Check password ... */ if( strcmp( Client_Password( Client ), Conf_ServerPwd ) != 0 ) { - /* Falsches Passwort */ + /* Bad password! */ Log( LOG_ERR, "User \"%s\" rejected (connection %d): Bad password!", Client_Mask( Client ), Client_Conn( Client )); - Conn_Close( Client_Conn( Client ), NULL, "Bad password", TRUE ); + Conn_Close( Client_Conn( Client ), NULL, "Bad password", true); return DISCONNECTED; } Log( LOG_NOTICE, "User \"%s\" registered (connection %d).", Client_Mask( Client ), Client_Conn( Client )); - /* Andere Server informieren */ + /* Inform other servers */ IRC_WriteStrServers( NULL, "NICK %s 1 %s %s 1 +%s :%s", Client_ID( Client ), Client_User( Client ), Client_Hostname( Client ), Client_Modes( Client ), Client_Info( Client )); - if( ! IRC_WriteStrClient( Client, RPL_WELCOME_MSG, Client_ID( Client ), Client_Mask( Client ))) return FALSE; - if( ! IRC_WriteStrClient( Client, RPL_YOURHOST_MSG, Client_ID( Client ), Client_ID( Client_ThisServer( )), VERSION, TARGET_CPU, TARGET_CPU, TARGET_OS )) return FALSE; - if( ! IRC_WriteStrClient( Client, RPL_CREATED_MSG, Client_ID( Client ), NGIRCd_StartStr )) return FALSE; - if( ! IRC_WriteStrClient( Client, RPL_MYINFO_MSG, Client_ID( Client ), Client_ID( Client_ThisServer( )), VERSION, USERMODES, CHANMODES )) return FALSE; + /* Welcome :-) */ + if( ! IRC_WriteStrClient( Client, RPL_WELCOME_MSG, Client_ID( Client ), Client_Mask( Client ))) return false; + + /* Version and system type */ +#ifdef CVSDATE + strlcpy( ver, CVSDATE, sizeof( ver )); + strncpy( ver + 4, ver + 5, 2 ); + strncpy( ver + 6, ver + 8, 3 ); + snprintf( vertxt, sizeof( vertxt ), "%s(%s)", PACKAGE_VERSION, ver ); + if( ! IRC_WriteStrClient( Client, RPL_YOURHOST_MSG, Client_ID( Client ), Client_ID( Client_ThisServer( )), vertxt, TARGET_CPU, TARGET_VENDOR, TARGET_OS )) return false; +#else + if( ! IRC_WriteStrClient( Client, RPL_YOURHOST_MSG, Client_ID( Client ), Client_ID( Client_ThisServer( )), PACKAGE_VERSION, TARGET_CPU, TARGET_VENDOR, TARGET_OS )) return false; +#endif + + if( ! IRC_WriteStrClient( Client, RPL_CREATED_MSG, Client_ID( Client ), NGIRCd_StartStr )) return false; +#ifdef CVSDATE + if( ! IRC_WriteStrClient( Client, RPL_MYINFO_MSG, Client_ID( Client ), Client_ID( Client_ThisServer( )), vertxt, USERMODES, CHANMODES )) return false; +#else + if( ! IRC_WriteStrClient( Client, RPL_MYINFO_MSG, Client_ID( Client ), Client_ID( Client_ThisServer( )), PACKAGE_VERSION, USERMODES, CHANMODES )) return false; +#endif + + /* Features */ + if( ! IRC_WriteStrClient( Client, RPL_ISUPPORT_MSG, Client_ID( Client ), CLIENT_NICK_LEN - 1, + COMMAND_LEN - 23, CLIENT_AWAY_LEN - 1, Conf_MaxJoins )) return DISCONNECTED; Client_SetType( Client, CLIENT_USER ); if( ! IRC_Send_LUSERS( Client )) return DISCONNECTED; if( ! IRC_Show_MOTD( Client )) return DISCONNECTED; + /* Suspend the client for a second ... */ + IRC_SetPenalty( Client, 1 ); + return CONNECTED; } /* Hello_User */ -LOCAL VOID -Kill_Nick( CHAR *Nick, CHAR *Reason ) +static void +Kill_Nick( char *Nick, char *Reason ) { - CLIENT *c; + REQUEST r; assert( Nick != NULL ); assert( Reason != NULL ); - Log( LOG_ERR, "User(s) with nick \"%s\" will be disconnected: %s", Nick, Reason ); + r.prefix = (char *)Client_ThisServer( ); + r.argv[0] = Nick; + r.argv[1] = Reason; + r.argc = 2; - /* andere Server benachrichtigen */ - IRC_WriteStrServers( NULL, "KILL %s :%s", Nick, Reason ); - - /* Ggf. einen eigenen Client toeten */ - c = Client_Search( Nick ); - if( c && ( Client_Conn( c ) != NONE )) Conn_Close( Client_Conn( c ), NULL, Reason, TRUE ); + Log( LOG_ERR, "User(s) with nick \"%s\" will be disconnected: %s", Nick, Reason ); + IRC_KILL( Client_ThisServer( ), &r ); } /* Kill_Nick */