#include "portab.h"
-static char UNUSED id[] = "$Id: irc-oper.c,v 1.18 2005/03/02 16:07:31 alex Exp $";
+static char UNUSED id[] = "$Id: irc-oper.c,v 1.28 2007/06/28 05:15:18 fw Exp $";
#include "imp.h"
#include <assert.h>
#include "ngircd.h"
#include "resolve.h"
-#include "conn.h"
+#include "conn-func.h"
#include "conf.h"
#include "client.h"
#include "channel.h"
#include "irc-write.h"
#include "log.h"
+#include "match.h"
#include "messages.h"
#include "parse.h"
#include "irc-oper.h"
-GLOBAL BOOLEAN
+static bool
+Bad_OperPass(CLIENT *Client, char *errtoken, char *errmsg)
+{
+ Log( LOG_WARNING, "Got invalid OPER from \"%s\": \"%s\" -- %s", Client_Mask( Client ),
+ errtoken, errmsg);
+ IRC_SetPenalty(Client, 3);
+ return IRC_WriteStrClient( Client, ERR_PASSWDMISMATCH_MSG, Client_ID( Client ));
+}
+
+
+GLOBAL bool
IRC_OPER( CLIENT *Client, REQUEST *Req )
{
- INT i;
+ unsigned int i;
assert( Client != NULL );
assert( Req != NULL );
if( Conf_Oper[i].name[0] && Conf_Oper[i].pwd[0] && ( strcmp( Conf_Oper[i].name, Req->argv[0] ) == 0 )) break;
}
if( i >= Conf_Oper_Count )
- {
- Log( LOG_WARNING, "Got invalid OPER from \"%s\": Name \"%s\" not configured!", Client_Mask( Client ), Req->argv[0] );
- return IRC_WriteStrClient( Client, ERR_PASSWDMISMATCH_MSG, Client_ID( Client ));
- }
+ return Bad_OperPass(Client, Req->argv[0], "not configured");
/* Stimmt das Passwort? */
if( strcmp( Conf_Oper[i].pwd, Req->argv[1] ) != 0 )
- {
- Log( LOG_WARNING, "Got invalid OPER from \"%s\": Bad password for \"%s\"!", Client_Mask( Client ), Conf_Oper[i].name );
- return IRC_WriteStrClient( Client, ERR_PASSWDMISMATCH_MSG, Client_ID( Client ));
- }
+ return Bad_OperPass(Client, Conf_Oper[i].name, "Bad password");
/* Authorized Mask? */
- if( Conf_Oper[i].mask && (! Match( Conf_Oper[i].mask, Client_Mask( Client ) ))) {
- Log( LOG_WARNING, "Rejected valid OPER for \"%s\": Mask mismatch (got: \"%s\", want: \"%s\")!", Conf_Oper[i].name, Client_Mask( Client ), Conf_Oper[i].mask );
- return IRC_WriteStrClient( Client, ERR_PASSWDMISMATCH_MSG, Client_ID( Client ));
- }
-
+ if( Conf_Oper[i].mask && (! Match( Conf_Oper[i].mask, Client_Mask( Client ) )))
+ return Bad_OperPass(Client, Conf_Oper[i].mask, "hostmask check failed" );
if( ! Client_HasMode( Client, 'o' ))
{
if( ! Client_OperByMe( Client )) Log( LOG_NOTICE|LOG_snotice, "Got valid OPER from \"%s\", user is an IRC operator now.", Client_Mask( Client ));
- Client_SetOperByMe( Client, TRUE );
+ Client_SetOperByMe( Client, true);
return IRC_WriteStrClient( Client, RPL_YOUREOPER_MSG, Client_ID( Client ));
} /* IRC_OPER */
-GLOBAL BOOLEAN
-IRC_DIE( CLIENT *Client, REQUEST *Req )
+GLOBAL bool
+IRC_DIE(CLIENT * Client, REQUEST * Req)
{
/* Shut down server */
- assert( Client != NULL );
- assert( Req != NULL );
+ CONN_ID c;
+ CLIENT *cl;
+
+ assert(Client != NULL);
+ assert(Req != NULL);
/* Not a local IRC operator? */
- if(( ! Client_HasMode( Client, 'o' )) || ( ! Client_OperByMe( Client ))) return IRC_WriteStrClient( Client, ERR_NOPRIVILEGES_MSG, Client_ID( Client ));
-
+ if ((!Client_HasMode(Client, 'o')) || (!Client_OperByMe(Client)))
+ return IRC_WriteStrClient(Client, ERR_NOPRIVILEGES_MSG,
+ Client_ID(Client));
+
/* Bad number of parameters? */
- if( Req->argc != 0 ) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command );
+#ifdef STRICT_RFC
+ if (Req->argc != 0)
+#else
+ if (Req->argc > 1)
+#endif
+ return IRC_WriteStrClient(Client, ERR_NEEDMOREPARAMS_MSG,
+ Client_ID(Client), Req->command);
+
+ /* Is a message given? */
+ if (Req->argc > 0) {
+ c = Conn_First();
+ while (c != NONE) {
+ cl = Conn_GetClient(c);
+ if (Client_Type(cl) == CLIENT_USER)
+ IRC_WriteStrClient(cl, "NOTICE %s :%s",
+ Client_ID(cl), Req->argv[0]);
+ c = Conn_Next(c);
+ }
+ }
+
+ Log(LOG_NOTICE | LOG_snotice, "Got DIE command from \"%s\" ...",
+ Client_Mask(Client));
+ NGIRCd_SignalQuit = true;
- Log( LOG_NOTICE|LOG_snotice, "Got DIE command from \"%s\" ...", Client_Mask( Client ));
- NGIRCd_SignalQuit = TRUE;
return CONNECTED;
} /* IRC_DIE */
-GLOBAL BOOLEAN
+GLOBAL bool
IRC_REHASH( CLIENT *Client, REQUEST *Req )
{
/* Reload configuration file */
if( Req->argc != 0 ) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command );
Log( LOG_NOTICE|LOG_snotice, "Got REHASH command from \"%s\" ...", Client_Mask( Client ));
- NGIRCd_SignalRehash = TRUE;
+ NGIRCd_SignalRehash = true;
return CONNECTED;
} /* IRC_REHASH */
-GLOBAL BOOLEAN
+GLOBAL bool
IRC_RESTART( CLIENT *Client, REQUEST *Req )
{
/* Restart IRC server (fork a new process) */
if( Req->argc != 0 ) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command );
Log( LOG_NOTICE|LOG_snotice, "Got RESTART command from \"%s\" ...", Client_Mask( Client ));
- NGIRCd_SignalRestart = TRUE;
+ NGIRCd_SignalRestart = true;
return CONNECTED;
} /* IRC_RESTART */
-GLOBAL BOOLEAN
-IRC_CONNECT(CLIENT *Client, REQUEST *Req )
+/**
+ * Connect configured or new server.
+ */
+GLOBAL bool
+IRC_CONNECT(CLIENT * Client, REQUEST * Req)
{
- /* Connect configured or new server */
- assert( Client != NULL );
- assert( Req != NULL );
+ assert(Client != NULL);
+ assert(Req != NULL);
/* Not a local IRC operator? */
- if(( ! Client_HasMode( Client, 'o' )) || ( ! Client_OperByMe( Client ))) return IRC_WriteStrClient( Client, ERR_NOPRIVILEGES_MSG, Client_ID( Client ));
+ if ((!Client_HasMode(Client, 'o')) || (!Client_OperByMe(Client)))
+ return IRC_WriteStrClient(Client, ERR_NOPRIVILEGES_MSG,
+ Client_ID(Client));
/* Bad number of parameters? */
- if(( Req->argc != 2 ) && ( Req->argc != 5 )) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command );
+ if ((Req->argc != 1) && (Req->argc != 2) && (Req->argc != 5))
+ return IRC_WriteStrClient(Client, ERR_NEEDMOREPARAMS_MSG,
+ Client_ID(Client), Req->command);
/* Invalid port number? */
- if( atoi( Req->argv[1] ) < 1 ) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command );
-
- Log( LOG_NOTICE|LOG_snotice, "Got CONNECT command from \"%s\" for \"%s\".", Client_Mask( Client ), Req->argv[0]);
-
- if( Req->argc == 2 )
- {
+ if ((Req->argc > 1) && atoi(Req->argv[1]) < 1)
+ return IRC_WriteStrClient(Client, ERR_NEEDMOREPARAMS_MSG,
+ Client_ID(Client), Req->command);
+
+ Log(LOG_NOTICE | LOG_snotice,
+ "Got CONNECT command from \"%s\" for \"%s\".", Client_Mask(Client),
+ Req->argv[0]);
+
+ switch (Req->argc) {
+ case 1:
+ if (!Conf_EnablePassiveServer(Req->argv[0]))
+ return IRC_WriteStrClient(Client, ERR_NOSUCHSERVER_MSG,
+ Client_ID(Client),
+ Req->argv[0]);
+ break;
+ case 2:
/* Connect configured server */
- if( ! Conf_EnableServer( Req->argv[0], atoi( Req->argv[1] ))) return IRC_WriteStrClient( Client, ERR_NOSUCHSERVER_MSG, Client_ID( Client ), Req->argv[0] );
- }
- else
- {
+ if (!Conf_EnableServer
+ (Req->argv[0], (UINT16) atoi(Req->argv[1])))
+ return IRC_WriteStrClient(Client, ERR_NOSUCHSERVER_MSG,
+ Client_ID(Client),
+ Req->argv[0]);
+ break;
+ default:
/* Add server */
- if( ! Conf_AddServer( Req->argv[0], atoi( Req->argv[1] ), Req->argv[2], Req->argv[3], Req->argv[4] )) return IRC_WriteStrClient( Client, ERR_NOSUCHSERVER_MSG, Client_ID( Client ), Req->argv[0] );
+ if (!Conf_AddServer
+ (Req->argv[0], (UINT16) atoi(Req->argv[1]), Req->argv[2],
+ Req->argv[3], Req->argv[4]))
+ return IRC_WriteStrClient(Client, ERR_NOSUCHSERVER_MSG,
+ Client_ID(Client),
+ Req->argv[0]);
}
+
return CONNECTED;
} /* IRC_CONNECT */
-GLOBAL BOOLEAN
+GLOBAL bool
IRC_DISCONNECT(CLIENT *Client, REQUEST *Req )
{
/* Disconnect and disable configured server */
if( ! Conf_DisableServer( Req->argv[0] )) return IRC_WriteStrClient( Client, ERR_NOSUCHSERVER_MSG, Client_ID( Client ), Req->argv[0] );
/* Are we still connected or were we killed, too? */
- if( Client_GetFromConn( my_conn )) return CONNECTED;
+ if( Conn_GetClient( my_conn )) return CONNECTED;
else return DISCONNECTED;
} /* IRC_CONNECT */
projects / ngircd-alex.git / blobdiff