* Naehere Informationen entnehmen Sie bitter der Datei COPYING. Eine Liste
* der an ngIRCd beteiligten Autoren finden Sie in der Datei AUTHORS.
*
- * $Id: irc.c,v 1.91 2002/05/30 16:52:21 alex Exp $
+ * $Id: irc.c,v 1.95 2002/09/16 09:14:45 alex Exp $
*
* irc.c: IRC-Befehle
*/
cl = Client_Search( Req->argv[0] );
if( cl )
{
+ /* Okay, Ziel ist ein Client. Aber ist es auch ein User? */
+ if( Client_Type( cl ) != CLIENT_USER ) return IRC_WriteStrClient( from, ERR_NOSUCHNICK_MSG, Client_ID( from ), Req->argv[0] );
+
/* Okay, Ziel ist ein User */
if(( Client_Type( Client ) != CLIENT_SERVER ) && ( strchr( Client_Modes( cl ), 'a' )))
{
if( ! from ) return IRC_WriteStrClient( Client, ERR_NOSUCHNICK_MSG, Client_ID( Client ), Req->prefix );
to = Client_Search( Req->argv[0] );
- if( to )
+ if(( to ) && ( Client_Type( to ) == CLIENT_USER ))
{
/* Okay, Ziel ist ein User */
return IRC_WriteStrClientPrefix( to, from, "NOTICE %s :%s", Client_ID( to ), Req->argv[1] );
/* haben wir selber einen solchen Client? */
c = Client_Search( Req->argv[0] );
- if( c && ( Client_Conn( c ) != NONE )) Conn_Close( Client_Conn( c ), NULL, Req->argv[1], TRUE );
-
+ if( c )
+ {
+ /* Ja, wir haben einen solchen Client */
+ if( Client_Conn( c ) != NONE ) Conn_Close( Client_Conn( c ), NULL, Req->argv[1], TRUE );
+ else Client_Destroy( c, NULL, Req->argv[1], TRUE );
+ }
+ else Log( LOG_NOTICE, "Client with nick \"%s\" is unknown here.", Req->argv[0] );
+
return CONNECTED;
} /* IRC_KILL */
+GLOBAL BOOLEAN
+IRC_ADMIN(CLIENT *Client, REQUEST *Req )
+{
+ CLIENT *target, *prefix;
+
+ 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_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command );
+
+ /* Ziel suchen */
+ if( Req->argc == 1 ) target = Client_Search( Req->argv[0] );
+ else target = Client_ThisServer( );
+
+ /* Prefix ermitteln */
+ if( Client_Type( Client ) == CLIENT_SERVER ) prefix = Client_Search( Req->prefix );
+ else prefix = Client;
+ if( ! prefix ) return IRC_WriteStrClient( Client, ERR_NOSUCHSERVER_MSG, Client_ID( Client ), Req->prefix );
+
+ /* An anderen Server weiterleiten? */
+ if( target != Client_ThisServer( ))
+ {
+ if( ! target ) return IRC_WriteStrClient( Client, ERR_NOSUCHSERVER_MSG, Client_ID( Client ), Req->argv[0] );
+
+ /* forwarden */
+ IRC_WriteStrClientPrefix( target, prefix, "ADMIN %s", Req->argv[0] );
+ return CONNECTED;
+ }
+
+ /* mit Versionsinfo antworten */
+ if( ! IRC_WriteStrClient( Client, RPL_ADMINME_MSG, Client_ID( prefix ), Conf_ServerName )) return DISCONNECTED;
+ if( ! IRC_WriteStrClient( Client, RPL_ADMINLOC1_MSG, Client_ID( prefix ), Conf_ServerAdmin1 )) return DISCONNECTED;
+ if( ! IRC_WriteStrClient( Client, RPL_ADMINLOC2_MSG, Client_ID( prefix ), Conf_ServerAdmin2 )) return DISCONNECTED;
+ if( ! IRC_WriteStrClient( Client, RPL_ADMINEMAIL_MSG, Client_ID( prefix ), Conf_ServerAdminMail )) return DISCONNECTED;
+
+ return CONNECTED;
+} /* IRC_ADMIN */
+
+
+
GLOBAL BOOLEAN
IRC_Show_MOTD( CLIENT *Client )
{