- ngIRCd GIT Updates - lists.barton.de

Alexander Barton : TOPIC command: test for channel admin rights correctly
by alex＠arthur.barton.de 09 Jan '11

09 Jan '11

Module: ngircd.git Branch: master Commit: 5ed7a4ea5755954dc6e25349125963cff7a4355c URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=5ed7a4ea… Author: Alexander Barton <alex(a)barton.de> Date: Sun Jan 9 23:08:15 2011 +0100 TOPIC command: test for channel admin rights correctly This enables other servers, services and IRC operators to change channel topics, even when the client is not joined to this channel. Now the handler for TOPIC behaves like the one for MODE. --- src/ngircd/irc-channel.c | 14 ++++++++++---- 1 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/ngircd/irc-channel.c b/src/ngircd/irc-channel.c index 8aa27c0..81a9eb2 100644 --- a/src/ngircd/irc-channel.c +++ b/src/ngircd/irc-channel.c @@ -407,7 +407,7 @@ IRC_TOPIC( CLIENT *Client, REQUEST *Req ) CHANNEL *chan; CLIENT *from; char *topic; - bool r; + bool onchannel, topicok, use_servermode, r; assert( Client != NULL ); assert( Req != NULL ); @@ -430,7 +430,10 @@ IRC_TOPIC( CLIENT *Client, REQUEST *Req ) return IRC_WriteStrClient(from, ERR_NOSUCHCHANNEL_MSG, Client_ID(from), Req->argv[0]); - if (!Channel_IsMemberOf(chan, from)) + Channel_CheckAdminRights(chan, Client, from, + &onchannel, &topicok, &use_servermode); + + if (!onchannel && !topicok) return IRC_WriteStrClient(from, ERR_NOTONCHANNEL_MSG, Client_ID(from), Req->argv[0]); @@ -457,8 +460,8 @@ IRC_TOPIC( CLIENT *Client, REQUEST *Req ) } if (strchr(Channel_Modes(chan), 't')) { - /* Topic Lock. Is the user a channel operator? */ - if (!strchr(Channel_UserModes(chan, from), 'o')) + /* Topic Lock. Is the user a channel or IRC operator? */ + if (!topicok) return IRC_WriteStrClient(from, ERR_CHANOPRIVSNEEDED_MSG, Client_ID(from), Channel_Name(chan)); @@ -470,6 +473,9 @@ IRC_TOPIC( CLIENT *Client, REQUEST *Req ) Client_TypeText(from), Client_Mask(from), Channel_Name(chan), Req->argv[1][0] ? Req->argv[1] : "<none>"); + if (use_servermode) + from = Client_ThisServer(); + /* Update channel and forward new topic to other servers */ if (!Channel_IsLocal(chan)) IRC_WriteStrServersPrefix(Client, from, "TOPIC %s :%s",

1 0

Alexander Barton : Channel_CheckAdminRights(): test if client can admin a channel
by alex＠arthur.barton.de 09 Jan '11

09 Jan '11

Module: ngircd.git Branch: master Commit: ba32d594fd7a93305cd01a14978971d948392510 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=ba32d594… Author: Alexander Barton <alex(a)barton.de> Date: Sun Jan 9 22:40:11 2011 +0100 Channel_CheckAdminRights(): test if client can admin a channel This generic function tests if a client is allowed to do administrative tasks to a specific channel: - servers and services are always truested ("allowed everything"), - channel operators are allowed, - IRC operarors are allowed if OperCanUseMode is set in the config. --- src/ngircd/channel.c | 60 ++++++++++++++++++++++++++++++++++++++++++++++++- src/ngircd/channel.h | 6 ++++- src/ngircd/irc-mode.c | 32 ++++++------------------- 3 files changed, 72 insertions(+), 26 deletions(-) diff --git a/src/ngircd/channel.c b/src/ngircd/channel.c index e49e5a9..c8c15d9 100644 --- a/src/ngircd/channel.c +++ b/src/ngircd/channel.c @@ -1,6 +1,6 @@ /* * ngIRCd -- The Next Generation IRC Daemon - * Copyright (c)2001-2009 Alexander Barton (alex(a)barton.de) + * Copyright (c)2001-2011 Alexander Barton (alex(a)barton.de) and Contributors. * * 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 @@ -1119,6 +1119,64 @@ Channel_CheckKey(CHANNEL *Chan, CLIENT *Client, const char *Key) } /* Channel_CheckKey */ +/** + * Check wether a client is allowed to administer a channel or not. + * + * @param Chan The channel to test. + * @param Client The client from which the command has been received. + * @param Origin The originator of the command (or NULL). + * @param OnChannel Set to true if the originator is member of the channel. + * @param AdminOk Set to true if the client is allowed to do + * administrative tasks on this channel. + * @param UseServerMode Set to true if ngIRCd should emulate "server mode", + * that is send commands as if originating from a server + * and not the originator of the command. + */ +GLOBAL void +Channel_CheckAdminRights(CHANNEL *Chan, CLIENT *Client, CLIENT *Origin, + bool *OnChannel, bool *AdminOk, bool *UseServerMode) +{ + assert (Chan != NULL); + assert (Client != NULL); + assert (OnChannel != NULL); + assert (AdminOk != NULL); + assert (UseServerMode != NULL); + + /* Use the client as origin, if no origin has been given (no prefix?) */ + if (!Origin) + Origin = Client; + + *OnChannel = false; + *AdminOk = false; + *UseServerMode = false; + + if (Client_Type(Client) != CLIENT_USER + && Client_Type(Client) != CLIENT_SERVER + && Client_Type(Client) != CLIENT_SERVICE) + return; + + /* Allow channel administration if the client is a server or service */ + if (Client_Type(Client) != CLIENT_USER) { + *AdminOk = true; + return; + } + + *OnChannel = Channel_IsMemberOf(Chan, Origin); + + if (*OnChannel && strchr(Channel_UserModes(Chan, Origin), 'o')) { + /* User is a channel operator */ + *AdminOk = true; + } else if (Conf_OperCanMode) { + /* IRC operators are allowed to administer channels as well */ + if (Client_OperByMe(Origin)) { + *AdminOk = true; + if (Conf_OperServerMode) + *UseServerMode = true; + } + } +} /* Channel_CheckAdminRights */ + + static CL2CHAN * Get_First_Cl2Chan( CLIENT *Client, CHANNEL *Chan ) { diff --git a/src/ngircd/channel.h b/src/ngircd/channel.h index 030f910..b912aab 100644 --- a/src/ngircd/channel.h +++ b/src/ngircd/channel.h @@ -1,6 +1,6 @@ /* * ngIRCd -- The Next Generation IRC Daemon - * Copyright (c)2001-2008 by Alexander Barton (alex(a)barton.de) + * Copyright (c)2001-2011 Alexander Barton (alex(a)barton.de) and Contributors. * * 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 @@ -133,6 +133,10 @@ GLOBAL void Channel_LogServer PARAMS((const char *msg)); GLOBAL bool Channel_CheckKey PARAMS((CHANNEL *Chan, CLIENT *Client, const char *Key)); +GLOBAL void Channel_CheckAdminRights PARAMS((CHANNEL *Chan, CLIENT *Client, + CLIENT *Origin, bool *OnChannel, + bool *AdminOk, bool *UseServerMode)); + #define Channel_IsLocal(c) (Channel_Name(c)[0] == '&') #define Channel_IsModeless(c) (Channel_Name(c)[0] == '+') diff --git a/src/ngircd/irc-mode.c b/src/ngircd/irc-mode.c index a4c1d89..1e6772a 100644 --- a/src/ngircd/irc-mode.c +++ b/src/ngircd/irc-mode.c @@ -1,6 +1,6 @@ /* * ngIRCd -- The Next Generation IRC Daemon - * Copyright (c)2001-2010 Alexander Barton (alex(a)barton.de) + * Copyright (c)2001-2011 Alexander Barton (alex(a)barton.de) and Contributors. * * 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 @@ -316,8 +316,7 @@ Channel_Mode(CLIENT *Client, REQUEST *Req, CLIENT *Origin, CHANNEL *Channel) { char the_modes[COMMAND_LEN], the_args[COMMAND_LEN], x[2], argadd[CLIENT_PASS_LEN], *mode_ptr; - bool connected, set, skiponce, retval, onchannel; - bool modeok = true, use_servermode = false; + bool connected, set, skiponce, retval, onchannel, modeok, use_servermode; int mode_arg, arg_arg; CLIENT *client; long l; @@ -331,28 +330,13 @@ Channel_Mode(CLIENT *Client, REQUEST *Req, CLIENT *Origin, CHANNEL *Channel) if (Req->argc <= 1) return Channel_Mode_Answer_Request(Origin, Channel); - /* Is the user allowed to change modes? */ - if (Client_Type(Client) == CLIENT_USER) { - /* Is the originating user on that channel? */ - onchannel = Channel_IsMemberOf(Channel, Origin); - modeok = false; - /* channel operator? */ - if (onchannel && - strchr(Channel_UserModes(Channel, Origin), 'o')) { - modeok = true; - } else if (Conf_OperCanMode) { - /* IRC-Operators can use MODE as well */ - if (Client_OperByMe(Origin)) { - modeok = true; - if (Conf_OperServerMode) - use_servermode = true; /* Change Origin to Server */ - } - } + Channel_CheckAdminRights(Channel, Client, Origin, + &onchannel, &modeok, &use_servermode); - if (!onchannel && !modeok) - return IRC_WriteStrClient(Origin, ERR_NOTONCHANNEL_MSG, - Client_ID(Origin), Channel_Name(Channel)); - } + if (!onchannel && !modeok) + return IRC_WriteStrClient(Origin, ERR_NOTONCHANNEL_MSG, + Client_ID(Origin), + Channel_Name(Channel)); mode_arg = 1; mode_ptr = Req->argv[mode_arg];

1 0

Florian Westphal : conf: fix 'unknown section' FEATURES parse error
by fw＠arthur.barton.de 09 Jan '11

09 Jan '11

Module: ngircd.git Branch: master Commit: 3460c87c589b0bfd735dbdd761e9a508a2d9a3c7 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=3460c87c… Author: Florian Westphal <fw(a)strlen.de> Date: Sun Jan 9 22:19:17 2011 +0100 conf: fix 'unknown section' FEATURES parse error pointed out by Alex: ngircd.conf, line 105: Unknown section "[Features]"! --- src/ngircd/conf.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/src/ngircd/conf.c b/src/ngircd/conf.c index 5819ef1..02f5520 100644 --- a/src/ngircd/conf.c +++ b/src/ngircd/conf.c @@ -769,7 +769,8 @@ Read_Config( bool ngircd_starting ) /* Is this the beginning of a new section? */ if(( str[0] == '[' ) && ( str[strlen( str ) - 1] == ']' )) { strlcpy( section, str, sizeof( section )); - if( strcasecmp( section, "[GLOBAL]" ) == 0 ) + if (strcasecmp( section, "[GLOBAL]" ) == 0 || + strcasecmp( section, "[FEATURES]") == 0) continue; if( strcasecmp( section, "[SERVER]" ) == 0 ) {

1 0

Alexander Barton : IRC_TOPIC(): code cleanup
by alex＠arthur.barton.de 09 Jan '11

09 Jan '11

Module: ngircd.git Branch: master Commit: 02592f912e9f4e43f4501ff4f15953d21b77d8b2 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=02592f91… Author: Alexander Barton <alex(a)barton.de> Date: Sun Jan 9 16:23:33 2011 +0100 IRC_TOPIC(): code cleanup --- src/ngircd/irc-channel.c | 56 ++++++++++++++++++++++++++++------------------ 1 files changed, 34 insertions(+), 22 deletions(-) diff --git a/src/ngircd/irc-channel.c b/src/ngircd/irc-channel.c index 3bf02c6..8aa27c0 100644 --- a/src/ngircd/irc-channel.c +++ b/src/ngircd/irc-channel.c @@ -412,44 +412,56 @@ IRC_TOPIC( CLIENT *Client, REQUEST *Req ) assert( Client != NULL ); assert( Req != NULL ); - if ((Req->argc < 1) || (Req->argc > 2)) - return IRC_WriteStrClient(Client, ERR_NEEDMOREPARAMS_MSG, Client_ID(Client), Req->command); + if (Req->argc < 1 || Req->argc > 2) + return IRC_WriteStrClient(Client, ERR_NEEDMOREPARAMS_MSG, + Client_ID(Client), Req->command); - if( Client_Type( Client ) == CLIENT_SERVER ) from = Client_Search( Req->prefix ); - else from = Client; - if( ! from ) return IRC_WriteStrClient( Client, ERR_NOSUCHNICK_MSG, Client_ID( Client ), Req->prefix ); + if (Client_Type(Client) == CLIENT_SERVER) + from = Client_Search(Req->prefix); + else + from = Client; - /* Welcher Channel? */ - chan = Channel_Search( Req->argv[0] ); - if( ! chan ) return IRC_WriteStrClient( from, ERR_NOSUCHCHANNEL_MSG, Client_ID( from ), Req->argv[0] ); + if (!from) + return IRC_WriteStrClient(Client, ERR_NOSUCHNICK_MSG, + Client_ID(Client), Req->prefix); - /* Ist der User Mitglied in dem Channel? */ - if( ! Channel_IsMemberOf( chan, from )) return IRC_WriteStrClient( from, ERR_NOTONCHANNEL_MSG, Client_ID( from ), Req->argv[0] ); + chan = Channel_Search(Req->argv[0]); + if (!chan) + return IRC_WriteStrClient(from, ERR_NOSUCHCHANNEL_MSG, + Client_ID(from), Req->argv[0]); - if( Req->argc == 1 ) - { + if (!Channel_IsMemberOf(chan, from)) + return IRC_WriteStrClient(from, ERR_NOTONCHANNEL_MSG, + Client_ID(from), Req->argv[0]); + + if (Req->argc == 1) { /* Request actual topic */ topic = Channel_Topic(chan); if (*topic) { r = IRC_WriteStrClient(from, RPL_TOPIC_MSG, - Client_ID(Client), Channel_Name(chan), topic); + Client_ID(Client), + Channel_Name(chan), topic); #ifndef STRICT_RFC r = IRC_WriteStrClient(from, RPL_TOPICSETBY_MSG, - Client_ID(Client), Channel_Name(chan), - Channel_TopicWho(chan), - Channel_TopicTime(chan)); + Client_ID(Client), + Channel_Name(chan), + Channel_TopicWho(chan), + Channel_TopicTime(chan)); #endif return r; } else - return IRC_WriteStrClient(from, RPL_NOTOPIC_MSG, - Client_ID(from), Channel_Name(chan)); + return IRC_WriteStrClient(from, RPL_NOTOPIC_MSG, + Client_ID(from), + Channel_Name(chan)); } - if( strchr( Channel_Modes( chan ), 't' )) - { - /* Topic Lock. Ist der User ein Channel Operator? */ - if( ! strchr( Channel_UserModes( chan, from ), 'o' )) return IRC_WriteStrClient( from, ERR_CHANOPRIVSNEEDED_MSG, Client_ID( from ), Channel_Name( chan )); + if (strchr(Channel_Modes(chan), 't')) { + /* Topic Lock. Is the user a channel operator? */ + if (!strchr(Channel_UserModes(chan, from), 'o')) + return IRC_WriteStrClient(from, ERR_CHANOPRIVSNEEDED_MSG, + Client_ID(from), + Channel_Name(chan)); } /* Set new topic */

1 0

Florian Westphal : conf: move 'run-time-feature-disable' options to new FEATURE section
by fw＠arthur.barton.de 09 Jan '11

09 Jan '11

Module: ngircd.git Branch: master Commit: 1964bda252ceb499f4a1f76f3e06d996acc2c821 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=1964bda2… Author: Florian Westphal <fw(a)strlen.de> Date: Sun Jan 9 19:42:42 2011 +0100 conf: move 'run-time-feature-disable' options to new FEATURE section --- doc/sample-ngircd.conf.tmpl | 27 ++++++++-------- man/ngircd.conf.5.tmpl | 57 +++++++++++++++++++-------------- src/ngircd/conf.c | 73 +++++++++++++++++++++++++----------------- 3 files changed, 90 insertions(+), 67 deletions(-) diff --git a/doc/sample-ngircd.conf.tmpl b/doc/sample-ngircd.conf.tmpl index 9bfa9d4..180bdce 100644 --- a/doc/sample-ngircd.conf.tmpl +++ b/doc/sample-ngircd.conf.tmpl @@ -134,19 +134,6 @@ # Allow Pre-Defined Channels only (see Section [Channels]) ;PredefChannelsOnly = no - # Do any DNS lookups when a client connects to the server. - ;DNS = yes - - # Do any IDENT lookups if ngIRCd has been compiled with support for it. - ;Ident = yes - - # Use PAM if ngIRCd has been compiled with support for it. - ;PAM = no - - # Use ZeroConf service registration if ngIRCd has been - # compiled with support for it (e.g. Howl, Avahi, Mac OS X). - ;ZeroConf = no - # try to connect to other irc servers using ipv4 and ipv6, if possible ;ConnectIPv6 = yes ;ConnectIPv4 = yes @@ -167,6 +154,20 @@ # maximum nick name length! ;MaxNickLength = 9 +[Features] + # Do any DNS lookups when a client connects to the server. + ;DNS = yes + + # Do any IDENT lookups if ngIRCd has been compiled with support for it. + ;Ident = yes + + # Use PAM if ngIRCd has been compiled with support for it. + ;PAM = no + + # Use ZeroConf service registration if ngIRCd has been + # compiled with support for it (e.g. Howl, Avahi, Mac OS X). + ;ZeroConf = no + [Operator] # [Operator] sections are used to define IRC Operators. There may be # more than one [Operator] block, one for each local operator. diff --git a/man/ngircd.conf.5.tmpl b/man/ngircd.conf.5.tmpl index 1a6301f..eb50472 100644 --- a/man/ngircd.conf.5.tmpl +++ b/man/ngircd.conf.5.tmpl @@ -47,13 +47,18 @@ ports on which the server should be listening. IRC operators of this server are defined in .I [Operator] blocks. +.I [Features] +can be used to disable compile-time features at run time, e.g. if ngircd +was built to support ident lookups, but you do not want ngircd to perform +ident lookups you can disable them here. +This section is optional. .I [Server] is the section where server links are configured. And .I [Channel] blocks are used to configure pre-defined ("persistent") IRC channels. .PP There can be more than one [Operator], [Server] and [Channel] sections -per configuration file, but only one [Global] section. +per configuration file, but only one [Global] and one [Features] section. .SH [GLOBAL] The .I [Global] @@ -205,29 +210,6 @@ you do not want to have channels other than those defined in [Channel] sections in the configuration file. Default: no. .TP -\fBDNS\fR -If set to false, ngIRCd will not make DNS lookups when clients connect. -If you configure the daemon to connect to other servers, ngIRCd may still -perform a DNS lookup if required. -Default: yes. -.TP -\fBIdent\fR -If ngIRCd is compiled with IDENT support this can be used to disable IDENT -lookups at run time. -Default: yes. -.TP -\fBPAM\fR -If ngIRCd is compiled with PAM support this can be used to disable all calls -to the PAM library at runtime; all users connecting without password are -allowed to connect, all passwords given will fail. -Default: yes. -.TP -\fBZeroConf\fR -If ngIRCd is compiled to register its services using ZeroConf (e.g. using -Howl, Avahi or on Mac OS X) this parameter can be used to disable service -registration at runtime. -Default: yes. -.TP \fBConnectIPv4\fR Set this to no if you do not want ngIRCd to connect to other IRC servers using IPv4. This allows usage of ngIRCd in IPv6-only setups. @@ -269,6 +251,33 @@ Password of the IRC operator. \fBMask\fR Mask that is to be checked before an /OPER for this account is accepted. Example: nick!ident(a)*.example.com +.SH [FEATURES] +An optional section that can be used to disable features at +run-time. A feature is enabled by default if if ngircd was built with +support for it. +\fBDNS\fR +If set to false, ngIRCd will not make DNS lookups when clients connect. +If you configure the daemon to connect to other servers, ngIRCd may still +perform a DNS lookup if required. +Default: yes. +.TP +\fBIdent\fR +If ngIRCd is compiled with IDENT support this can be used to disable IDENT +lookups at run time. +Default: yes. +.TP +\fBPAM\fR +If ngIRCd is compiled with PAM support this can be used to disable all calls +to the PAM library at runtime; all users connecting without password are +allowed to connect, all passwords given will fail. +Default: yes. +.TP +\fBZeroConf\fR +If ngIRCd is compiled to register its services using ZeroConf (e.g. using +Howl, Avahi or on Mac OS X) this parameter can be used to disable service +registration at runtime. +Default: yes. +.TP .SH [SERVER] Other servers are configured in .I [Server] diff --git a/src/ngircd/conf.c b/src/ngircd/conf.c index 5a992eb..5819ef1 100644 --- a/src/ngircd/conf.c +++ b/src/ngircd/conf.c @@ -62,6 +62,7 @@ static bool Read_Config PARAMS(( bool ngircd_starting )); static bool Validate_Config PARAMS(( bool TestOnly, bool Rehash )); static void Handle_GLOBAL PARAMS(( int Line, char *Var, char *Arg )); +static void Handle_FEATURES PARAMS(( int Line, char *Var, char *Arg )); static void Handle_OPERATOR PARAMS(( int Line, char *Var, char *Arg )); static void Handle_SERVER PARAMS(( int Line, char *Var, char *Arg )); static void Handle_CHANNEL PARAMS(( int Line, char *Var, char *Arg )); @@ -232,7 +233,7 @@ opers_free(void) { struct Conf_Oper *op; size_t len; - + len = array_length(&Conf_Opers, sizeof(*op)); op = array_start(&Conf_Opers); while (len--) { @@ -247,7 +248,7 @@ opers_puts(void) { struct Conf_Oper *op; size_t len; - + len = array_length(&Conf_Opers, sizeof(*op)); op = array_start(&Conf_Opers); while (len--) { @@ -341,11 +342,6 @@ Conf_Test( void ) printf(" OperServerMode = %s\n", yesno_to_str(Conf_OperServerMode)); printf(" AllowRemoteOper = %s\n", yesno_to_str(Conf_AllowRemoteOper)); printf(" PredefChannelsOnly = %s\n", yesno_to_str(Conf_PredefChannelsOnly)); - printf(" DNS = %s\n", yesno_to_str(Conf_DNS)); - printf(" Ident = %s\n", yesno_to_str(Conf_Ident)); - printf(" PAM = %s\n", yesno_to_str(Conf_PAM)); - printf(" ZeroConf = %s\n", yesno_to_str(Conf_ZeroConf)); - #ifdef WANT_IPV6 printf(" ConnectIPv4 = %s\n", yesno_to_str(Conf_ConnectIPv6)); printf(" ConnectIPv6 = %s\n", yesno_to_str(Conf_ConnectIPv4)); @@ -355,6 +351,13 @@ Conf_Test( void ) printf(" MaxJoins = %d\n", Conf_MaxJoins > 0 ? Conf_MaxJoins : -1); printf(" MaxNickLength = %u\n\n", Conf_MaxNickLength - 1); + puts("[FEATURES]"); + printf(" DNS = %s\n", yesno_to_str(Conf_DNS)); + printf(" Ident = %s\n", yesno_to_str(Conf_Ident)); + printf(" PAM = %s\n", yesno_to_str(Conf_PAM)); + printf(" ZeroConf = %s\n", yesno_to_str(Conf_ZeroConf)); + puts(""); + opers_puts(); for( i = 0; i < MAX_SERVERS; i++ ) { @@ -818,6 +821,7 @@ Read_Config( bool ngircd_starting ) arg = ptr + 1; ngt_TrimStr( arg ); if( strcasecmp( section, "[GLOBAL]" ) == 0 ) Handle_GLOBAL( line, var, arg ); + else if( strcasecmp( section, "[FEATURES]" ) == 0 ) Handle_FEATURES( line, var, arg ); else if( strcasecmp( section, "[OPERATOR]" ) == 0 ) Handle_OPERATOR( line, var, arg ); else if( strcasecmp( section, "[SERVER]" ) == 0 ) Handle_SERVER( line, var, arg ); else if( strcasecmp( section, "[CHANNEL]" ) == 0 ) Handle_CHANNEL( line, var, arg ); @@ -1117,7 +1121,7 @@ Handle_GLOBAL( int Line, char *Var, char *Arg ) if (CheckLegacyNoOption(Var, Arg)) { Config_Error(LOG_WARNING, "%s, line %d: \"No\"-Prefix has been removed, use " - "\"%s = %s\" instead", + "\"%s = %s\" in [FEATURES] section instead", NGIRCd_ConfFile, Line, NoNo(Var), InvertArg(Arg)); if (strcasecmp(Var, "NoIdent") == 0) WarnIdent(Line); @@ -1125,28 +1129,6 @@ Handle_GLOBAL( int Line, char *Var, char *Arg ) WarnPAM(Line); return; } - if( strcasecmp( Var, "DNS" ) == 0 ) { - /* do reverse dns lookups when clients connect? */ - Conf_DNS = Check_ArgIsTrue( Arg ); - return; - } - if (strcasecmp(Var, "Ident") == 0) { - /* do IDENT lookups when clients connect? */ - Conf_Ident = Check_ArgIsTrue(Arg); - WarnIdent(Line); - return; - } - if(strcasecmp(Var, "PAM") == 0) { - /* use PAM library to authenticate users */ - Conf_PAM = Check_ArgIsTrue(Arg); - WarnPAM(Line); - return; - } - if(strcasecmp(Var, "ZeroConf") == 0) { - /* register services using ZeroConf */ - Conf_ZeroConf = Check_ArgIsTrue(Arg); - return; - } #ifdef WANT_IPV6 /* the default setting for all the WANT_IPV6 special options is 'true' */ if( strcasecmp( Var, "ConnectIPv6" ) == 0 ) { @@ -1272,6 +1254,37 @@ Handle_GLOBAL( int Line, char *Var, char *Arg ) static void +Handle_FEATURES(int Line, char *Var, char *Arg) +{ + assert( Line > 0 ); + assert( Var != NULL ); + assert( Arg != NULL ); + + if( strcasecmp( Var, "DNS" ) == 0 ) { + /* do reverse dns lookups when clients connect? */ + Conf_DNS = Check_ArgIsTrue( Arg ); + return; + } + if (strcasecmp(Var, "Ident") == 0) { + /* do IDENT lookups when clients connect? */ + Conf_Ident = Check_ArgIsTrue(Arg); + WarnIdent(Line); + return; + } + if(strcasecmp(Var, "PAM") == 0) { + /* use PAM library to authenticate users */ + Conf_PAM = Check_ArgIsTrue(Arg); + WarnPAM(Line); + return; + } + if(strcasecmp(Var, "ZeroConf") == 0) { + /* register services using ZeroConf */ + Conf_ZeroConf = Check_ArgIsTrue(Arg); + return; + } +} + +static void Handle_OPERATOR( int Line, char *Var, char *Arg ) { size_t len;

1 0

Florian Westphal : conf: Warn if PAM= true when ngircd was built without PAM support
by fw＠arthur.barton.de 09 Jan '11

09 Jan '11

Module: ngircd.git Branch: master Commit: eda2556e0919e48aa8fb7556383aa81a089b4135 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=eda2556e… Author: Florian Westphal <fw(a)strlen.de> Date: Sun Jan 9 18:17:35 2011 +0100 conf: Warn if PAM=true when ngircd was built without PAM support --- src/ngircd/conf.c | 19 +++++++++++++++++-- 1 files changed, 17 insertions(+), 2 deletions(-) diff --git a/src/ngircd/conf.c b/src/ngircd/conf.c index db52869..5a992eb 100644 --- a/src/ngircd/conf.c +++ b/src/ngircd/conf.c @@ -899,8 +899,20 @@ WarnIdent(int UNUSED Line) if (Conf_Ident) { /* user has enabled ident lookups explicitly, but ... */ Config_Error(LOG_WARNING, - "%s: line %d: Ident=True, but ngircd was built without IDENT support", - NGIRCd_ConfFile, Line); + "%s: line %d: %s=True, but ngircd was built without support", + NGIRCd_ConfFile, Line, "Ident"); + } +#endif +} + +static void +WarnPAM(int UNUSED Line) +{ +#ifndef PAM + if (Conf_PAM) { + Config_Error(LOG_WARNING, + "%s: line %d: %s=True, but ngircd was built without support", + NGIRCd_ConfFile, Line, "PAM"); } #endif } @@ -1109,6 +1121,8 @@ Handle_GLOBAL( int Line, char *Var, char *Arg ) NGIRCd_ConfFile, Line, NoNo(Var), InvertArg(Arg)); if (strcasecmp(Var, "NoIdent") == 0) WarnIdent(Line); + else if (strcasecmp(Var, "NoPam") == 0) + WarnPAM(Line); return; } if( strcasecmp( Var, "DNS" ) == 0 ) { @@ -1125,6 +1139,7 @@ Handle_GLOBAL( int Line, char *Var, char *Arg ) if(strcasecmp(Var, "PAM") == 0) { /* use PAM library to authenticate users */ Conf_PAM = Check_ArgIsTrue(Arg); + WarnPAM(Line); return; } if(strcasecmp(Var, "ZeroConf") == 0) {

1 0

Florian Westphal : array: remove alignment of requested size
by fw＠arthur.barton.de 09 Jan '11

09 Jan '11

Module: ngircd.git Branch: master Commit: 994a003aba9aac4a8adca7f4f4fec0889b0f2bb1 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=994a003a… Author: Florian Westphal <fw(a)strlen.de> Date: Sun Jan 9 19:28:50 2011 +0100 array: remove alignment of requested size libc should know better than us. Also, this helps debugging with tools like valgrind: When you allocate an array of size x, and then erronoulsy use x+1 valgrind cannot detect the bug because due to ALIGN_() made by array.c we might have allocated more than size x... --- src/ngircd/array.c | 36 ++++-------------------------------- 1 files changed, 4 insertions(+), 32 deletions(-) diff --git a/src/ngircd/array.c b/src/ngircd/array.c index 1e56b71..75106f6 100644 --- a/src/ngircd/array.c +++ b/src/ngircd/array.c @@ -27,12 +27,6 @@ static char UNUSED id[] = "$Id: array.c,v 1.15 2007/11/18 15:05:35 alex Exp $"; #define array_UNUSABLE(x) ( !(x)->mem || (0 == (x)->allocated) ) - -#define ALIGN_32U(x) (((x)+(unsigned)31 ) & ~((unsigned)31)) -#define ALIGN_1024U(x) (((x)+(unsigned)1023) & ~((unsigned)1023)) -#define ALIGN_4096U(x) (((x)+(unsigned)4095) & ~((unsigned)4095)) - - static bool safemult_sizet(size_t a, size_t b, size_t *res) { @@ -61,7 +55,6 @@ void * array_alloc(array * a, size_t size, size_t pos) { size_t alloc, pos_plus1 = pos + 1; - size_t aligned = 0; char *tmp; assert(size > 0); @@ -70,43 +63,22 @@ array_alloc(array * a, size_t size, size_t pos) return NULL; if (a->allocated < alloc) { - if (alloc < 128) { - aligned = ALIGN_32U(alloc); - } else { - if (alloc < 4096) { - aligned = ALIGN_1024U(alloc); - } else { - aligned = ALIGN_4096U(alloc); - } - } -#ifdef DEBUG_ARRAY - Log(LOG_DEBUG, "array_alloc(): rounded %u to %u bytes.", alloc, aligned); -#endif - - assert(aligned >= alloc); - - if (aligned < alloc) /* rounding overflow */ - return NULL; - - alloc = aligned; #ifdef DEBUG_ARRAY Log(LOG_DEBUG, "array_alloc(): changing size from %u to %u bytes.", - a->allocated, aligned); + a->allocated, alloc); #endif - tmp = realloc(a->mem, alloc); if (!tmp) return NULL; a->mem = tmp; a->allocated = alloc; - - assert(a->allocated > a->used); - memset(a->mem + a->used, 0, a->allocated - a->used); - a->used = alloc; } + + assert(a->allocated >= a->used); + return a->mem + (pos * size); }

1 0

Florian Westphal : array: remove check for allocated == 0
by fw＠arthur.barton.de 09 Jan '11

09 Jan '11

Module: ngircd.git Branch: master Commit: 23ce0393b23779f19d6d56103c46f9d929fdef53 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=23ce0393… Author: Florian Westphal <fw(a)strlen.de> Date: Sun Jan 9 19:40:54 2011 +0100 array: remove check for allocated == 0 allocated can only be zero if ->mem is NULL. --- src/ngircd/array.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/ngircd/array.c b/src/ngircd/array.c index 75106f6..0fa9608 100644 --- a/src/ngircd/array.c +++ b/src/ngircd/array.c @@ -12,8 +12,6 @@ #include "array.h" -static char UNUSED id[] = "$Id: array.c,v 1.15 2007/11/18 15:05:35 alex Exp $"; - #include <assert.h> #include <stdlib.h> @@ -26,7 +24,7 @@ static char UNUSED id[] = "$Id: array.c,v 1.15 2007/11/18 15:05:35 alex Exp $"; -#define array_UNUSABLE(x) ( !(x)->mem || (0 == (x)->allocated) ) +#define array_UNUSABLE(x) ( !(x)->mem ) static bool safemult_sizet(size_t a, size_t b, size_t *res) { @@ -93,6 +91,7 @@ array_length(const array * const a, size_t membersize) if (array_UNUSABLE(a)) return 0; + assert(a->allocated); return membersize ? a->used / membersize : 0; } @@ -104,6 +103,7 @@ array_copy(array * dest, const array * const src) if (array_UNUSABLE(src)) return false; + assert(src->allocated); return array_copyb(dest, src->mem, src->used); }

1 0

Florian Westphal : conf: add missing static qualifier
by fw＠arthur.barton.de 09 Jan '11

09 Jan '11

Module: ngircd.git Branch: master Commit: 9402bcaa73a9365f861108f1b53eec1c09837eef URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=9402bcaa… Author: Florian Westphal <fw(a)strlen.de> Date: Sun Jan 9 17:54:21 2011 +0100 conf: add missing static qualifier internal helper, so it should be static. also, add UNUSED to 'Line'. --- src/ngircd/conf.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ngircd/conf.c b/src/ngircd/conf.c index b194d3a..db52869 100644 --- a/src/ngircd/conf.c +++ b/src/ngircd/conf.c @@ -893,7 +893,7 @@ Handle_MaxNickLength(int Line, const char *Arg) static void -WarnIdent(int Line) +WarnIdent(int UNUSED Line) { #ifndef IDENTAUTH if (Conf_Ident) { @@ -927,7 +927,7 @@ CheckLegacyNoOption(const char *Var, const char *Arg) return false; } -const char * +static const char * NoNo(const char *str) { assert(strncasecmp("no", str, 2) == 0 && str[2]);

1 0

Alexander Barton : Update copyright notices for 2010 :)
by alex＠arthur.barton.de 09 Jan '11

09 Jan '11

Module: ngircd.git Branch: master Commit: 6d11fb149707194e986b0d64af3d44f21e158fcc URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=6d11fb14… Author: Alexander Barton <alex(a)barton.de> Date: Sun Jan 9 16:11:12 2011 +0100 Update copyright notices for 2010 :) And update the NEWS and ChangeLog file as well. --- AUTHORS | 5 ++--- ChangeLog | 18 +++++++++++++++--- INSTALL | 5 ++--- NEWS | 14 +++++++++++--- README | 5 ++--- src/ngircd/ngircd.c | 4 ++-- 6 files changed, 34 insertions(+), 17 deletions(-) diff --git a/AUTHORS b/AUTHORS index e0e1d07..03a19dd 100644 --- a/AUTHORS +++ b/AUTHORS @@ -1,9 +1,8 @@ ngIRCd - Next Generation IRC Server + http://ngircd.barton.de/ - (c)2001-2009 Alexander Barton, - alex(a)barton.de, http://www.barton.de/ - + (c)2001-2011 Alexander Barton and Contributors. ngIRCd is free software and published under the terms of the GNU General Public License. diff --git a/ChangeLog b/ChangeLog index 93206ef..03090b8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,15 +1,27 @@ ngIRCd - Next Generation IRC Server + http://ngircd.barton.de/ - (c)2001-2010 Alexander Barton, - alex(a)barton.de, http://www.barton.de/ - + (c)2001-2011 Alexander Barton and Contributors. ngIRCd is free software and published under the terms of the GNU General Public License. -- ChangeLog -- +ngIRCd + + - Make [No]ZeroConf configuration option work with Howl. + - Deprecate NoXX-Options in ngircd.conf: 'NoDNS=no' => 'DNS=yes', + 'NoIdent=no' => 'Ident=yes', 'NoPAM=no' => 'PAM=yes', and + 'NoZeroConf=no' => 'ZeroConf=yes' (and vice-versa). + The defaults are adjusted accordingly and the old variables are still + accepted, so there is no functional change. + - Fix confusing "adding to invite list" debug messages. + - Don't throttle services and servers beeing registered. + - Xcode: correctly sort files + - Don't assert() when serching a client for an invalid server token. + ngIRCd Release 17.1 (2010-12-19) - --configtest: remember if MOTD is configured by file or phrase diff --git a/INSTALL b/INSTALL index f7e51a1..ce43e35 100644 --- a/INSTALL +++ b/INSTALL @@ -1,9 +1,8 @@ ngIRCd - Next Generation IRC Server + http://ngircd.barton.de/ - (c)2001-2010 Alexander Barton, - alex(a)barton.de, http://www.barton.de/ - + (c)2001-2011 Alexander Barton and Contributors. ngIRCd is free software and published under the terms of the GNU General Public License. diff --git a/NEWS b/NEWS index 9524e8b..0d6ef8a 100644 --- a/NEWS +++ b/NEWS @@ -1,15 +1,23 @@ ngIRCd - Next Generation IRC Server + http://ngircd.barton.de/ - (c)2001-2010 Alexander Barton, - alex(a)barton.de, http://www.barton.de/ - + (c)2001-2011 Alexander Barton and Contributors. ngIRCd is free software and published under the terms of the GNU General Public License. -- NEWS -- +ngIRCd + + - Deprecate NoXX-Options in ngircd.conf: 'NoDNS=no' => 'DNS=yes', + 'NoIdent=no' => 'Ident=yes', 'NoPAM=no' => 'PAM=yes', and + 'NoZeroConf=no' => 'ZeroConf=yes' (and vice-versa). + The defaults are adjusted accordingly and the old variables are still + accepted, so there is no functional change. + - Don't throttle services and servers beeing registered. + ngIRCd Release 17.1 (2010-12-19) - Don't log critical (or worse) messages to stderr diff --git a/README b/README index 1feedfe..3c39cad 100644 --- a/README +++ b/README @@ -1,9 +1,8 @@ ngIRCd - Next Generation IRC Server + http://ngircd.barton.de/ - (c)2001-2007 Alexander Barton, - alex(a)barton.de, http://www.barton.de/ - + (c)2001-2011 Alexander Barton and Contributors. ngIRCd is free software and published under the terms of the GNU General Public License. diff --git a/src/ngircd/ngircd.c b/src/ngircd/ngircd.c index 6dfd206..63fc64b 100644 --- a/src/ngircd/ngircd.c +++ b/src/ngircd/ngircd.c @@ -1,6 +1,6 @@ /* * ngIRCd -- The Next Generation IRC Daemon - * Copyright (c)2001-2010 Alexander Barton (alex(a)barton.de) + * Copyright (c)2001-2011 Alexander Barton (alex(a)barton.de) and Contributors. * * 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 @@ -432,7 +432,7 @@ static void Show_Version( void ) { puts( NGIRCd_Version ); - puts( "Copyright (c)2001-2010 Alexander Barton (<alex(a)barton.de>) and Contributors." ); + puts( "Copyright (c)2001-2011 Alexander Barton (<alex(a)barton.de>) and Contributors." ); puts( "Homepage: <http://ngircd.barton.de/>\n" ); puts( "This is free software; see the source for copying conditions. There is NO" ); puts( "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." );

1 0