X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fngircd%2Firc-login.c;h=149cbfe94ccda4b431c7dc66502ed8e2a2fa5c93;hb=1d08d51e2eaff14b71f20d3f0898d5a86582b7e5;hp=87ccbcdb502c2888e52428d7714904ed61886981;hpb=1e59617d2c70ebc4e5008a4233cc759fee715c8f;p=ngircd-alex.git diff --git a/src/ngircd/irc-login.c b/src/ngircd/irc-login.c index 87ccbcdb..149cbfe9 100644 --- a/src/ngircd/irc-login.c +++ b/src/ngircd/irc-login.c @@ -2,38 +2,40 @@ * 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.24 2002/11/30 15:04:57 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.40 2004/03/11 22:16:31 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" @@ -115,7 +117,7 @@ IRC_PASS( CLIENT *Client, REQUEST *Req ) flags++; } else flags = ""; - Log( LOG_INFO, "Connection %d: Peer announces itself as %s-%s using protocol %d.%d/IRC+ (flags: \"%s\").", Client_Conn( Client ), impl, serverver, protohigh, protolow, flags ); + Log( LOG_INFO, "Peer announces itself as %s-%s using protocol %d.%d/IRC+ (flags: \"%s\").", impl, serverver, protohigh, protolow, flags ); } else { @@ -124,7 +126,7 @@ IRC_PASS( CLIENT *Client, REQUEST *Req ) serverver = ""; if( strchr( ircflags, 'Z' )) flags = "Z"; else flags = ""; - Log( LOG_INFO, "Connection %d: Peer announces itself as \"%s\" using protocol %d.%d (flags: \"%s\").", Client_Conn( Client ), impl, protohigh, protolow, flags ); + Log( LOG_INFO, "Peer announces itself as \"%s\" using protocol %d.%d (flags: \"%s\").", impl, protohigh, protolow, flags ); } Client_SetType( Client, CLIENT_GOTPASSSERVER ); @@ -223,6 +225,7 @@ IRC_NICK( CLIENT *Client, REQUEST *Req ) /* neuen Client-Nick speichern */ Client_SetID( target, Req->argv[0] ); + IRC_SetPenalty( target, 2 ); } return CONNECTED; @@ -283,6 +286,10 @@ IRC_NICK( CLIENT *Client, REQUEST *Req ) GLOBAL BOOLEAN IRC_USER( CLIENT *Client, REQUEST *Req ) { +#ifdef IDENTAUTH + CHAR *ptr; +#endif + assert( Client != NULL ); assert( Req != NULL ); @@ -292,11 +299,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 ); + /* 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 ); - Client_SetInfo( Client, Req->argv[3] ); +#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 ); @@ -372,7 +389,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 */ @@ -404,7 +421,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 */ @@ -428,12 +445,16 @@ IRC_PONG( CLIENT *Client, REQUEST *Req ) LOCAL BOOLEAN 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 ); return DISCONNECTED; @@ -441,19 +462,41 @@ Hello_User( CLIENT *Client ) 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 )); + /* Welcome :-) */ 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_VENDOR, TARGET_OS )) 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; - if( ! IRC_WriteStrClient( Client, RPL_MYINFO_MSG, Client_ID( Client ), Client_ID( Client_ThisServer( )), VERSION, USERMODES, CHANMODES )) 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, CHANNEL_TOPIC_LEN - 1, 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 */ @@ -461,19 +504,18 @@ Hello_User( CLIENT *Client ) LOCAL 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 */