Januar 2011 - ngIRCd GIT Updates

Alexander Barton : Update testsuite configuration: strip No... prefixes
by alex＠arthur.barton.de 18 Jan '11

18 Jan '11

Module: ngircd.git Branch: master Commit: 5a34bb203ae61c22edbf64741cf9222a04eeead9 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=5a34bb20… Author: Alexander Barton <alex(a)barton.de> Date: Tue Jan 18 14:28:39 2011 +0100 Update testsuite configuration: strip No... prefixes --- src/testsuite/ngircd-test1.conf | 8 ++++---- src/testsuite/ngircd-test2.conf | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/testsuite/ngircd-test1.conf b/src/testsuite/ngircd-test1.conf index 25ec842..8e154ef 100644 --- a/src/testsuite/ngircd-test1.conf +++ b/src/testsuite/ngircd-test1.conf @@ -1,5 +1,5 @@ # ngIRCd test suite -# configuration file for test server #2 +# configuration file for test server #1 [Global] Name = ngircd.test.server @@ -10,8 +10,8 @@ MaxConnectionsIP = 0 OperCanUseMode = yes MaxJoins = 4 - NoIdent = yes - NoPAM = yes + Ident = no + PAM = no [Operator] Name = TestOp @@ -23,7 +23,6 @@ PeerPassword = pwd2 [Channel] -# This name should be accepted as '#InviteChannel' by ngircd. Name = InviteChannel Modes = i @@ -50,4 +49,5 @@ [Channel] Name = +ModelessChannel Topic = A modeless Channel + # -eof- diff --git a/src/testsuite/ngircd-test2.conf b/src/testsuite/ngircd-test2.conf index 0805b4e..2d788d6 100644 --- a/src/testsuite/ngircd-test2.conf +++ b/src/testsuite/ngircd-test2.conf @@ -10,8 +10,8 @@ MaxConnectionsIP = 0 OperCanUseMode = yes MaxJoins = 4 - NoIdent = yes - NoPAM = yes + Ident = yes + PAM = yes [Operator] Name = TestOp

1 0

Alexander Barton : Add connection/socket information to some log messages
by alex＠arthur.barton.de 16 Jan '11

16 Jan '11

Module: ngircd.git Branch: master Commit: d3ef2239e1d0f3477a4b7f0f7a31ef3bb36ef1e7 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=d3ef2239… Author: Alexander Barton <alex(a)barton.de> Date: Sun Jan 16 23:24:41 2011 +0100 Add connection/socket information to some log messages --- src/ngircd/conn.c | 19 ++++++++++++------- src/ngircd/irc-login.c | 10 ++++++---- 2 files changed, 18 insertions(+), 11 deletions(-) diff --git a/src/ngircd/conn.c b/src/ngircd/conn.c index b798e6e..98a0543 100644 --- a/src/ngircd/conn.c +++ b/src/ngircd/conn.c @@ -238,8 +238,10 @@ cb_connserver(int sock, UNUSED short what) static void server_login(CONN_ID idx) { - Log( LOG_INFO, "Connection %d with \"%s:%d\" established. Now logging in ...", idx, - My_Connections[idx].host, Conf_Server[Conf_GetServer( idx )].port ); + Log(LOG_INFO, + "Connection %d (socket %d) with \"%s:%d\" established. Now logging in ...", + idx, My_Connections[idx].sock, My_Connections[idx].host, + Conf_Server[Conf_GetServer(idx)].port); io_event_setcb( My_Connections[idx].sock, cb_clientserver); io_event_add( My_Connections[idx].sock, IO_WANTREAD|IO_WANTWRITE); @@ -1765,14 +1767,17 @@ New_Server( int Server , ng_ipaddr_t *dest) return; } - Log(LOG_INFO, "Establishing connection for \"%s\" to \"%s\" (%s) port %d ... ", - Conf_Server[Server].name, Conf_Server[Server].host, ip_str, - Conf_Server[Server].port); - af_dest = ng_ipaddr_af(dest); new_sock = socket(af_dest, SOCK_STREAM, 0); + + Log(LOG_INFO, + "Establishing connection for \"%s\" to \"%s:%d\" (%s), socket %d ...", + Conf_Server[Server].name, Conf_Server[Server].host, + Conf_Server[Server].port, ip_str, new_sock); + if (new_sock < 0) { - Log( LOG_CRIT, "Can't create socket (af %d) : %s!", af_dest, strerror( errno )); + Log(LOG_CRIT, "Can't create socket (af %d): %s!", + af_dest, strerror(errno)); return; } diff --git a/src/ngircd/irc-login.c b/src/ngircd/irc-login.c index 381dd20..73dd8d1 100644 --- a/src/ngircd/irc-login.c +++ b/src/ngircd/irc-login.c @@ -151,8 +151,9 @@ IRC_PASS( CLIENT *Client, REQUEST *Req ) } else flags = ""; Log(LOG_INFO, - "Peer announces itself as %s-%s using protocol %d.%d/IRC+ (flags: \"%s\").", - impl, serverver, protohigh, protolow, flags); + "Peer on conenction %d announces itself as %s-%s using protocol %d.%d/IRC+ (flags: \"%s\").", + Client_Conn(Client), impl, serverver, + protohigh, protolow, flags); } else { /* The peer seems to be a server supporting the * "original" IRC protocol (RFC 2813). */ @@ -161,8 +162,9 @@ IRC_PASS( CLIENT *Client, REQUEST *Req ) else flags = ""; Log(LOG_INFO, - "Peer announces itself as \"%s\" using protocol %d.%d (flags: \"%s\").", - impl, protohigh, protolow, flags); + "Peer on connection %d announces itself as \"%s\" using protocol %d.%d (flags: \"%s\").", + Client_Conn(Client), impl, + protohigh, protolow, flags); } Client_SetFlags(Client, flags); }

1 0

Alexander Barton : Implement channel mode 'O': "IRC operators only"
by alex＠arthur.barton.de 10 Jan '11

10 Jan '11

Module: ngircd.git Branch: master Commit: a57748e1a14dc6fa51291d31dae92c9a5abdd7c0 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=a57748e1… Author: Alexander Barton <alex(a)barton.de> Date: Mon Jan 10 12:15:05 2011 +0100 Implement channel mode 'O': "IRC operators only" This channel mode is used on DALnet (bahamut), for example. --- src/ngircd/defines.h | 2 +- src/ngircd/irc-channel.c | 7 +++++++ src/ngircd/irc-mode.c | 17 +++++++++++++++++ src/ngircd/messages.h | 1 + 4 files changed, 26 insertions(+), 1 deletions(-) diff --git a/src/ngircd/defines.h b/src/ngircd/defines.h index ff456a3..3f1122c 100644 --- a/src/ngircd/defines.h +++ b/src/ngircd/defines.h @@ -81,7 +81,7 @@ in seconds. */ #define USERMODES "aciorswx" /* Supported user modes. */ -#define CHANMODES "biIklmnoPstvz" /* Supported channel modes. */ +#define CHANMODES "biIklmnoOPstvz" /* Supported channel modes. */ #define CONNECTED true /* Internal status codes. */ #define DISCONNECTED false diff --git a/src/ngircd/irc-channel.c b/src/ngircd/irc-channel.c index 81a9eb2..ed71dc7 100644 --- a/src/ngircd/irc-channel.c +++ b/src/ngircd/irc-channel.c @@ -122,6 +122,13 @@ join_allowed(CLIENT *Client, CHANNEL *chan, const char *channame, return false; } + if (strchr(channel_modes, 'O') && !Client_OperByMe(Client)) { + /* Only IRC operators are allowed! */ + IRC_WriteStrClient(Client, ERR_OPONLYCHANNEL_MSG, + Client_ID(Client), channame); + return false; + } + return true; } diff --git a/src/ngircd/irc-mode.c b/src/ngircd/irc-mode.c index 1e6772a..30f4dee 100644 --- a/src/ngircd/irc-mode.c +++ b/src/ngircd/irc-mode.c @@ -499,6 +499,23 @@ Channel_Mode(CLIENT *Client, REQUEST *Req, CLIENT *Origin, CHANNEL *Channel) goto chan_exit; } break; + case 'O': /* IRC operators only */ + if (modeok) { + /* Only IRC operators are allowed to + * set the 'O' channel mode! */ + if (set && !(Client_OperByMe(Client) + || Client_Type(Client) == CLIENT_SERVER)) + connected = IRC_WriteStrClient(Origin, + ERR_NOPRIVILEGES_MSG, + Client_ID(Origin)); + else + x[0] = 'O'; + } else + connected = IRC_WriteStrClient(Origin, + ERR_CHANOPRIVSNEEDED_MSG, + Client_ID(Origin), + Channel_Name(Channel)); + break; case 'P': /* Persistent channel */ if (modeok) { /* Only IRC operators are allowed to diff --git a/src/ngircd/messages.h b/src/ngircd/messages.h index 900d2ff..ec4bd86 100644 --- a/src/ngircd/messages.h +++ b/src/ngircd/messages.h @@ -117,6 +117,7 @@ #define ERR_PASSWDMISMATCH_MSG "464 %s :Invalid password" #define ERR_CHANNELISFULL_MSG "471 %s %s :Cannot join channel (+l)" #define ERR_SECURECHANNEL_MSG "471 %s %s :Cannot join channel (+z)" +#define ERR_OPONLYCHANNEL_MSG "471 %s %s :Cannot join channel (+O)" #define ERR_UNKNOWNMODE_MSG "472 %s: %c :is unknown mode char for %s" #define ERR_INVITEONLYCHAN_MSG "473 %s %s :Cannot join channel (+i)" #define ERR_BANNEDFROMCHAN_MSG "474 %s %s :Cannot join channel (+b)"

1 0

Alexander Barton : Remove ZeroConf variable from sample-ngircd.conf
by alex＠arthur.barton.de 10 Jan '11

10 Jan '11

Module: ngircd.git Branch: master Commit: 6600ce3445c5363c75e743a0eec173cc73d79434 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=6600ce34… Author: Alexander Barton <alex(a)barton.de> Date: Mon Jan 10 00:10:01 2011 +0100 Remove ZeroConf variable from sample-ngircd.conf --- doc/sample-ngircd.conf.tmpl | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/doc/sample-ngircd.conf.tmpl b/doc/sample-ngircd.conf.tmpl index 180bdce..58696be 100644 --- a/doc/sample-ngircd.conf.tmpl +++ b/doc/sample-ngircd.conf.tmpl @@ -164,10 +164,6 @@ # 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.

1 0

Alexander Barton : Remove support for ZeroConf/Bonjour/ Rendezvous service registration
by alex＠arthur.barton.de 09 Jan '11

09 Jan '11

Module: ngircd.git Branch: master Commit: 4a6d44dce2436103dafaad199597ada354d9b794 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=4a6d44dc… Author: Alexander Barton <alex(a)barton.de> Date: Sun Jan 9 23:51:30 2011 +0100 Remove support for ZeroConf/Bonjour/Rendezvous service registration --- INSTALL | 12 +- configure.in | 80 +----- contrib/MacOSX/config.h | 10 - contrib/MacOSX/ngIRCd.xcodeproj/project.pbxproj | 8 - doc/Makefile.am | 2 +- doc/Zeroconf.txt | 40 --- man/ngircd.conf.5.tmpl | 6 - src/ngircd/Makefile.am | 4 +- src/ngircd/conf.c | 15 - src/ngircd/conf.h | 3 - src/ngircd/conn.c | 49 +--- src/ngircd/defines.h | 5 - src/ngircd/ngircd.c | 15 - src/ngircd/rendezvous.c | 379 ----------------------- src/ngircd/rendezvous.h | 39 --- 15 files changed, 19 insertions(+), 648 deletions(-) Diff: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commitdiff;h=4a6d…

1 0

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