albino
/
ngircd-tor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

change Handle_OPERATOR() formatting

This commit is contained in:
Florian Westphal 2005-07-17 18:58:04 +00:00
parent fca29bfa23
commit 987559e46d
1 changed files with 26 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/ngircd/conf.c
View File

@ -14,7 +14,7 @@
#include "portab.h" #include "portab.h"
static char UNUSED id[] = "$Id: conf.c,v 1.79 2005/07/11 14:11:35 fw Exp $"; static char UNUSED id[] = "$Id: conf.c,v 1.80 2005/07/17 18:58:04 fw Exp $";
#include "imp.h" #include "imp.h"
#include <assert.h> #include <assert.h>
@ -804,35 +804,47 @@ Handle_GLOBAL( int Line, char *Var, char *Arg )
LOCAL void LOCAL void
Handle_OPERATOR( int Line, char *Var, char *Arg ) Handle_OPERATOR( int Line, char *Var, char *Arg )
{ {
unsigned int opercount;
size_t len;
assert( Line > 0 ); assert( Line > 0 );
assert( Var != NULL ); assert( Var != NULL );
assert( Arg != NULL ); assert( Arg != NULL );
assert( Conf_Oper_Count > 0 ); assert( Conf_Oper_Count > 0 );
if( strcasecmp( Var, "Name" ) == 0 ) if ( Conf_Oper_Count == 0 )
{ return;
opercount = Conf_Oper_Count - 1;
if( strcasecmp( Var, "Name" ) == 0 ) {
/* Name of IRC operator */ /* Name of IRC operator */
if( strlcpy( Conf_Oper[Conf_Oper_Count - 1].name, Arg, sizeof( Conf_Oper[Conf_Oper_Count - 1].name )) >= sizeof( Conf_Oper[Conf_Oper_Count - 1].name )) Config_Error_TooLong( Line, Var ); len = strlcpy( Conf_Oper[opercount].name, Arg, sizeof( Conf_Oper[opercount].name ));
if (len >= sizeof( Conf_Oper[opercount].name ))
Config_Error_TooLong( Line, Var );
return; return;
} }
if( strcasecmp( Var, "Password" ) == 0 ) if( strcasecmp( Var, "Password" ) == 0 ) {
{
/* Password of IRC operator */ /* Password of IRC operator */
if( strlcpy( Conf_Oper[Conf_Oper_Count - 1].pwd, Arg, sizeof( Conf_Oper[Conf_Oper_Count - 1].pwd )) >= sizeof( Conf_Oper[Conf_Oper_Count - 1].pwd )) Config_Error_TooLong( Line, Var ); len = strlcpy( Conf_Oper[opercount].pwd, Arg, sizeof( Conf_Oper[opercount].pwd ));
if (len >= sizeof( Conf_Oper[opercount].pwd ))
Config_Error_TooLong( Line, Var );
return; return;
} }
if( strcasecmp( Var, "Mask" ) == 0 ) if( strcasecmp( Var, "Mask" ) == 0 ) {
{ if (Conf_Oper[opercount].mask) return; /* Hostname already configured */
if (Conf_Oper[Conf_Oper_Count - 1].mask) return; /* Hostname already configured */
Conf_Oper[Conf_Oper_Count - 1].mask = strdup( Arg ); Conf_Oper[opercount].mask = strdup( Arg );
if (! Conf_Oper[Conf_Oper_Count - 1].mask) { if (! Conf_Oper[opercount].mask) {
Config_Error( LOG_ERR, "%s, line %d: Cannot allocate memory for operator mask: %s", NGIRCd_ConfFile, Line, strerror(errno) ); Config_Error( LOG_ERR, "%s, line %d: Cannot allocate memory for operator mask: %s",
NGIRCd_ConfFile, Line, strerror(errno) );
return; return;
} }
return; return;
} }
Config_Error( LOG_ERR, "%s, line %d (section \"Operator\"): Unknown variable \"%s\"!", NGIRCd_ConfFile, Line, Var ); Config_Error( LOG_ERR, "%s, line %d (section \"Operator\"): Unknown variable \"%s\"!",
NGIRCd_ConfFile, Line, Var );
} /* Handle_OPERATOR */ } /* Handle_OPERATOR */