- ngIRCd GIT Updates - lists.barton.de

Alexander Barton : Make configure[.ng] compatible with autoconf 1.10 again
by alex＠arthur.barton.de 24 Mär '13

24 Mär '13

Module: ngircd.git Branch: master Commit: a14eb495b75c8c2a2a32ddb6eecf50dc174f811c URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=a14eb495… Author: Alexander Barton <alex(a)barton.de> Date: Mon Mar 18 12:45:32 2013 +0100 Make configure[.ng] compatible with autoconf 1.10 again The incompatibility has been introduced by commit d0c9f4a6, "configure: search for iconv_open as well as libiconv_open". --- configure.ng | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/configure.ng b/configure.ng index 6c28f39..49fc75a 100644 --- a/configure.ng +++ b/configure.ng @@ -527,14 +527,15 @@ if test "$x_ircplus_on" = "yes"; then LDFLAGS="-L$withval/lib $LDFLAGS" fi AC_CHECK_LIB(iconv, iconv_open) - AC_CHECK_FUNCS(iconv_open, x_iconv_on=yes, + AC_CHECK_FUNCS(iconv_open, x_iconv_on=yes) + if test "$x_iconv_on" != "yes"; then AC_CHECK_LIB(iconv, libiconv_open) - AC_CHECK_FUNCS(libiconv_open, x_iconv_on=yes, - AC_MSG_ERROR([Can't enable libiconv support!]) - ) - ) - fi - ] + AC_CHECK_FUNCS(libiconv_open, x_iconv_on=yes) + fi + if test "$x_iconv_on" != "yes"; then + AC_MSG_ERROR([Can't enable libiconv support!]) + fi + fi ] ) if test "$x_iconv_on" = "yes"; then AC_DEFINE(ICONV, 1)

1 0

Sebastian Köhler : Lists_CheckReason(): Check for Client_MaskCloaked()
by alex＠arthur.barton.de 24 Mär '13

24 Mär '13

Module: ngircd.git Branch: master Commit: 0131e1e00bc8ad35b030dfa6b8ab769b0657e174 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=0131e1e0… Author: Sebastian Köhler <sebkoehler(a)whoami.org.uk> Date: Wed Mar 20 03:40:31 2013 +0100 Lists_CheckReason(): Check for Client_MaskCloaked() Look for possible cloaked Masks in Lists. Users with +x usermode can be banned with their cloaked hostname now. --- src/ngircd/lists.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ngircd/lists.c b/src/ngircd/lists.c index 6faf311..21058a0 100644 --- a/src/ngircd/lists.c +++ b/src/ngircd/lists.c @@ -342,7 +342,7 @@ Lists_CheckReason(struct list_head *h, CLIENT *Client) while (e) { next = e->next; - if (Match(e->mask, Client_Mask(Client))) { + if (Match(e->mask, Client_MaskCloaked(Client))) { if (e->valid_until == 1) { /* Entry is valid only once, delete it */ LogDebug("Deleted \"%s\" from list (used).",

1 0

Alexander Barton : Services.txt: Anope 1.9.8 has been released now
by alex＠arthur.barton.de 13 Mär '13

13 Mär '13

Module: ngircd.git Branch: master Commit: 8618e942e6c6de37dfebb9fbca992d173e8a8382 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=8618e942… Author: Alexander Barton <alex(a)barton.de> Date: Wed Mar 13 22:08:16 2013 +0100 Services.txt: Anope 1.9.8 has been released now --- doc/Services.txt | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/doc/Services.txt b/doc/Services.txt index dc0872f..2704f02 100644 --- a/doc/Services.txt +++ b/doc/Services.txt @@ -14,7 +14,7 @@ acting as a "regular servers" ("pseudo servers") are supported, either using the IRC protocol as defined in RFC 1459 or RFC 2812. Support for Services has been tested using - - Anope 1.9.8 or later (<http://www.anope.org/>; unreleased!) + - Anope 1.9.8 or later (<http://www.anope.org/>) - Atheme 7.0.2 or later (<http://www.atheme.net>) - "IRC Services" 5.1.x by Andrew Church (<http://achurch.org/services/>) @@ -44,10 +44,8 @@ Example: Setting up Anope 1.9.x ~~~~~~~~~~~~~~~~~~~~~~ -Anope 1.9.8 or later (<http://www.anope.org/>; unreleased as of 2013-02-26) -may be used with ngIRCd using the "ngircd" protocol module. -Until Anope 1.9.8 is released, you have to use the sources from the Anope -development GIT tree, see <http://github.com/anope/anope>! +Anope 1.9.8 or later (<http://www.anope.org/>) can be used with ngIRCd using +the "ngircd" protocol module. At least the following settings have to be tweaked, in addition to all the settings marked as required by Anope:

1 0

Alexander Barton : Commands.txt: Update description of the "KILL" command
by alex＠arthur.barton.de 09 Mär '13

09 Mär '13

Module: ngircd.git Branch: master Commit: 2fea782efc480a71a36a9877d3c31d479bd3072f URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=2fea782e… Author: Alexander Barton <alex(a)barton.de> Date: Sat Mar 9 18:00:49 2013 +0100 Commands.txt: Update description of the "KILL" command --- doc/Commands.txt | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/doc/Commands.txt b/doc/Commands.txt index 92d25c7..4058f3d 100644 --- a/doc/Commands.txt +++ b/doc/Commands.txt @@ -513,9 +513,16 @@ Administrative Commands To list the G-Lines, type "STATS g". - KILL - KILL <nick> <reason> + KILL <nickname> <reason> . - Forcibly removes <nick> from the IRC network with a <reason>. + Forcibly remove all users with a given <nickname> from the IRC + network and display the given <reason> to them. + . + This command is used internally between servers, too, for example + to disconnect duplicate <nickname>'s after a "net split". + + References: + - RFC 2812, 3.7.1 "Kill message" - KLINE KLINE <nick!user@hostmask> <seconds> :<reason>

1 0

Alexander Barton : Conn_Handler(): Don't test for penalty times
by alex＠arthur.barton.de 09 Mär '13

09 Mär '13

Module: ngircd.git Branch: master Commit: a2e26aad1e106aac256991a3d0c43c6c3fda7d4b URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=a2e26aad… Author: Alexander Barton <alex(a)barton.de> Date: Sat Mar 9 17:58:10 2013 +0100 Conn_Handler(): Don't test for penalty times The Conn_Handler() main loop calls Handle_Buffer() which checks for the "penalty time" of each client itself, so don't do it twice. --- src/ngircd/conn.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/ngircd/conn.c b/src/ngircd/conn.c index eeedb44..087f5fc 100644 --- a/src/ngircd/conn.c +++ b/src/ngircd/conn.c @@ -853,8 +853,7 @@ Conn_Handler(void) /* Look for non-empty read buffers ... */ for (i = 0; i < Pool_Size; i++) { if ((My_Connections[i].sock > NONE) - && (array_bytes(&My_Connections[i].rbuf) > 0) - && (My_Connections[i].delaytime <= t)) { + && (array_bytes(&My_Connections[i].rbuf) > 0)) { /* ... and try to handle the received data */ bytes_processed = Handle_Buffer(i); /* if we processed data, and there might be

1 0

Alexander Barton : Don' t read SSL client data before DNS resolver is finished
by alex＠arthur.barton.de 09 Mär '13

09 Mär '13

Module: ngircd.git Branch: master Commit: b4393277ea1cc67bc8433fcbeded3fc2186f5c54 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=b4393277… Author: Alexander Barton <alex(a)barton.de> Date: Sat Mar 9 17:44:34 2013 +0100 Don't read SSL client data before DNS resolver is finished Fix the cb_clientserver_ssl() callback function to not read in and store SSL encrypted client data before the asynchronous DNS resolver sub-process has finished: This could have resulted in discarding the resolved client hostname and IDENT reply afterwards, because in some situations (timing dependent) the NICK and USER commands could have already been read in from the client, stored in the buffer, and been processed. Thanks to Julian Brost for reporting the issue and testing, and to Federico G. Schwindt <fgsch(a)lodoss.net> for helping to debug it! --- src/ngircd/conn.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/src/ngircd/conn.c b/src/ngircd/conn.c index 3c1427d..eeedb44 100644 --- a/src/ngircd/conn.c +++ b/src/ngircd/conn.c @@ -367,13 +367,13 @@ cb_clientserver(int sock, short what) #ifdef SSL_SUPPORT /** - * IO callback for established SSL-enabled client and server connections. + * IO callback for new SSL-enabled client and server connections. * * @param sock Socket descriptor. * @param what IO specification (IO_WANTREAD/IO_WANTWRITE/...). */ static void -cb_clientserver_ssl(int sock, short what) +cb_clientserver_ssl(int sock, UNUSED short what) { CONN_ID idx = Socket2Index(sock); @@ -390,14 +390,11 @@ cb_clientserver_ssl(int sock, short what) case 0: return; /* EAGAIN: callback will be invoked again by IO layer */ default: - Conn_Close(idx, "SSL accept error, closing socket", "SSL accept error", false); + Conn_Close(idx, + "SSL accept error, closing socket", "SSL accept error", + false); return; } - if (what & IO_WANTREAD) - Read_Request(idx); - - if (what & IO_WANTWRITE) - Handle_Write(idx); io_event_setcb(sock, cb_clientserver); /* SSL handshake completed */ }

1 0

Alexander Barton : Increase password length limit to 64 characters
by alex＠arthur.barton.de 08 Mär '13

08 Mär '13

Module: ngircd.git Branch: master Commit: b33da9b8f3e46f3174093c01aa9e75b65964ecf2 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=b33da9b8… Author: Alexander Barton <alex(a)barton.de> Date: Fri Mar 8 19:31:57 2013 +0100 Increase password length limit to 64 characters Closes bug #154. --- src/ngircd/defines.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ngircd/defines.h b/src/ngircd/defines.h index 3850b58..6b92a69 100644 --- a/src/ngircd/defines.h +++ b/src/ngircd/defines.h @@ -99,7 +99,7 @@ #define CLIENT_NICK_LEN 32 /** Max. password length (including NULL). */ -#define CLIENT_PASS_LEN 21 +#define CLIENT_PASS_LEN 65 /** Max. length of user name ("login"; incl. NULL), RFC 2812, section 1.2.1. */ #ifndef STRICT_RFC

1 0

Alexander Barton : doc/Services.txt: Update Anope status and URL
by alex＠arthur.barton.de 26 Feb '13

26 Feb '13

Module: ngircd.git Branch: master Commit: 3e3585708010cc0da22355aca84c9e79f8286e0b URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=3e358570… Author: Alexander Barton <alex(a)barton.de> Date: Tue Feb 26 09:38:27 2013 +0100 doc/Services.txt: Update Anope status and URL --- doc/Services.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/Services.txt b/doc/Services.txt index f51bd48..dc0872f 100644 --- a/doc/Services.txt +++ b/doc/Services.txt @@ -44,10 +44,10 @@ Example: Setting up Anope 1.9.x ~~~~~~~~~~~~~~~~~~~~~~ -Anope 1.9.8 or later (<http://www.anope.org/>; unreleased as of 2012-11-10) +Anope 1.9.8 or later (<http://www.anope.org/>; unreleased as of 2013-02-26) may be used with ngIRCd using the "ngircd" protocol module. Until Anope 1.9.8 is released, you have to use the sources from the Anope -development GIT tree, see <http://sourceforge.net/projects/anope/develop/>! +development GIT tree, see <http://github.com/anope/anope>! At least the following settings have to be tweaked, in addition to all the settings marked as required by Anope:

1 0

Alexander Barton : irc-op.c: use irc-macros.h
by alex＠arthur.barton.de 24 Feb '13

24 Feb '13

Module: ngircd.git Branch: master Commit: 3228f1b2677e6edd1b0cfe81ac31069914ecd61b URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=3228f1b2… Author: Alexander Barton <alex(a)barton.de> Date: Sun Feb 24 18:51:54 2013 +0100 irc-op.c: use irc-macros.h --- src/ngircd/irc-op.c | 28 +++++----------------------- 1 file changed, 5 insertions(+), 23 deletions(-) diff --git a/src/ngircd/irc-op.c b/src/ngircd/irc-op.c index 0297015..23fcc71 100644 --- a/src/ngircd/irc-op.c +++ b/src/ngircd/irc-op.c @@ -24,6 +24,7 @@ #include "defines.h" #include "conn.h" #include "channel.h" +#include "irc-macros.h" #include "irc-write.h" #include "lists.h" #include "log.h" @@ -69,9 +70,8 @@ IRC_KICK(CLIENT *Client, REQUEST *Req) assert( Client != NULL ); assert( Req != NULL ); - if ((Req->argc < 2) || (Req->argc > 3)) - return IRC_WriteStrClient(Client, ERR_NEEDMOREPARAMS_MSG, - Client_ID(Client), Req->command); + _IRC_ARGC_BETWEEN_OR_RETURN_(Client, Req, 2, 3) + _IRC_GET_SENDER_OR_RETURN_(from, Req, Client) while (*itemList) { if (*itemList == ',') { @@ -90,15 +90,6 @@ IRC_KICK(CLIENT *Client, REQUEST *Req) itemList++; } - 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); - reason = Req->argc == 3 ? Req->argv[2] : Client_ID(from); currentNick = Req->argv[1]; currentChannel = Req->argv[0]; @@ -155,17 +146,8 @@ IRC_INVITE(CLIENT *Client, REQUEST *Req) assert( Client != NULL ); assert( Req != NULL ); - if (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); + _IRC_ARGC_EQ_OR_RETURN_(Client, Req, 2) + _IRC_GET_SENDER_OR_RETURN_(from, Req, Client) /* Search user */ target = Client_Search(Req->argv[0]);

1 0

Alexander Barton : Commands.txt: Update description of the "INVITE" command
by alex＠arthur.barton.de 24 Feb '13

24 Feb '13

Module: ngircd.git Branch: master Commit: be08349dcb2ed3e89040112a241e022ee802baa4 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=be08349d… Author: Alexander Barton <alex(a)barton.de> Date: Sun Feb 24 18:53:10 2013 +0100 Commands.txt: Update description of the "INVITE" command --- doc/Commands.txt | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/doc/Commands.txt b/doc/Commands.txt index 2d3cab2..2967b43 100644 --- a/doc/Commands.txt +++ b/doc/Commands.txt @@ -419,14 +419,17 @@ Channel Commands ~~~~~~~~~~~~~~~~ - INVITE - INVITE <nick> <channel> + INVITE <nickname> <channel> . - Invites <nick> to <channel>. - <channel> does not have to exist, but if it does, only members of the - channel are allowed to invite other clients. + Invite <nickname> to join channel <channel>. . - If the <channel> mode "+i" is set, only <channel> operators may invite - other clients. + <channel> does not have to exist, but if it does, only members of the + channel are allowed to invite other users. If the channel mode "+i" + is set, only channel "half-ops" (and above) may invite other clients, + and if channel mode "+V" is set, nobody can invite other users. + + References: + - RFC 2812, 3.2.7 "Invite message" - JOIN JOIN <channels> [<channel-keys>]

1 0