- ngIRCd GIT Updates - lists.barton.de

Alexander Barton : Document new configuration option "MaxListSize"
by alex＠arthur.barton.de 28 Okt '12

28 Okt '12

Module: ngircd.git Branch: master Commit: 8ff153d7d40e4933e5ac66016ac30d35cbde3227 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=8ff153d7… Author: Alexander Barton <alex(a)barton.de> Date: Sun Oct 28 20:36:58 2012 +0100 Document new configuration option "MaxListSize" --- ChangeLog | 2 ++ NEWS | 2 ++ man/ngircd.conf.5.tmpl | 3 +++ 3 files changed, 7 insertions(+) diff --git a/ChangeLog b/ChangeLog index a14f9f7..1e2392e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -11,6 +11,8 @@ ngIRCd + - New configuration option "MaxListSize" to configure the maximum number + of channels returned by a LIST command. The default is 100, as before. - Implement user mode "b", "block messages": when a user has set mode "b", all private messages and notices to this user are blocked if they don't originate from a registered user, an IRC Op, server or service. The diff --git a/NEWS b/NEWS index fd906b2..95d5372 100644 --- a/NEWS +++ b/NEWS @@ -11,6 +11,8 @@ ngIRCd + - New configuration option "MaxListSize" to configure the maximum number + of channels returned by a LIST command. The default is 100, as before. - Implement user mode "b", "block messages": when a user has set mode "b", all private messages and notices to this user are blocked if they don't originate from a registered user, an IRC Op, server or service. The diff --git a/man/ngircd.conf.5.tmpl b/man/ngircd.conf.5.tmpl index 5f9d6dd..03fac57 100644 --- a/man/ngircd.conf.5.tmpl +++ b/man/ngircd.conf.5.tmpl @@ -182,6 +182,9 @@ Maximum length of an user nick name (Default: 9, as in RFC 2812). Please note that all servers in an IRC network MUST use the same maximum nick name length! .TP +\fBMaxListSize\fR (number) +Maximum number of channels returned in response to a LIST command. Default: 100. +.TP \fBPingTimeout\fR (number) After <PingTimeout> seconds of inactivity the server will send a PING to the peer to test whether it is alive or not. Default: 120.

1 0

Alexander Barton : Update NEWS and ChangeLog files
by alex＠arthur.barton.de 24 Okt '12

24 Okt '12

Module: ngircd.git Branch: master Commit: 23572af942399288bcf4e67245563b05ff4fc0f7 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=23572af9… Author: Alexander Barton <alex(a)barton.de> Date: Wed Oct 24 22:03:56 2012 +0200 Update NEWS and ChangeLog files --- ChangeLog | 104 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-- NEWS | 44 +++++++++++++++++++++++++- 2 files changed, 145 insertions(+), 3 deletions(-) Diff: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commitdiff;h=2357…

1 0

Alexander Barton : Allow remote servers and IRC Ops to change channel topics
by alex＠arthur.barton.de 19 Okt '12

19 Okt '12

Module: ngircd.git Branch: master Commit: 8d9cfa157a7fd067dab3483614d427f35dfa4ad1 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=8d9cfa15… Author: Alexander Barton <alex(a)barton.de> Date: Fri Oct 19 19:45:44 2012 +0200 Allow remote servers and IRC Ops to change channel topics Remote servers are always allowed to change all channel topics, and IRC Operators are allowed to change all channel topics if the configuration option "OperCanUseMode" is enabled. Bug introduced by commit 7b01bb8 and reported by DNS777. --- src/ngircd/irc-channel.c | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/src/ngircd/irc-channel.c b/src/ngircd/irc-channel.c index 4a157d6..f9d2dc1 100644 --- a/src/ngircd/irc-channel.c +++ b/src/ngircd/irc-channel.c @@ -512,7 +512,7 @@ IRC_TOPIC( CLIENT *Client, REQUEST *Req ) CHANNEL *chan; CLIENT *from; char *topic; - bool r, is_oper; + bool r, topic_power; assert( Client != NULL ); assert( Req != NULL ); @@ -535,11 +535,17 @@ IRC_TOPIC( CLIENT *Client, REQUEST *Req ) return IRC_WriteStrClient(from, ERR_NOSUCHCHANNEL_MSG, Client_ID(from), Req->argv[0]); - /* Only IRC opers and channel members allowed */ - is_oper = Client_OperByMe(from); - if (!Channel_IsMemberOf(chan, from) && !is_oper) - return IRC_WriteStrClient(from, ERR_NOTONCHANNEL_MSG, - Client_ID(from), Req->argv[0]); + /* Only remote servers and channel members are allowed to change the + * channel topic, and IRC opreators when the Conf_OperCanMode option + * is set in the server configuration. */ + if (Client_Type(Client) != CLIENT_SERVER) { + topic_power = Client_HasMode(from, 'o'); + if (!Channel_IsMemberOf(chan, from) + && !(Conf_OperCanMode && topic_power)) + return IRC_WriteStrClient(from, ERR_NOTONCHANNEL_MSG, + Client_ID(from), Req->argv[0]); + } else + topic_power = true; if (Req->argc == 1) { /* Request actual topic */ @@ -567,11 +573,11 @@ IRC_TOPIC( CLIENT *Client, REQUEST *Req ) if (strchr(Channel_Modes(chan), 't')) { /* Topic Lock. Is the user a channel op or IRC operator? */ - if(!strchr(Channel_UserModes(chan, from), 'h') && + if(!topic_power && + !strchr(Channel_UserModes(chan, from), 'h') && !strchr(Channel_UserModes(chan, from), 'o') && !strchr(Channel_UserModes(chan, from), 'a') && - !strchr(Channel_UserModes(chan, from), 'q') && - !is_oper) + !strchr(Channel_UserModes(chan, from), 'q')) return IRC_WriteStrClient(from, ERR_CHANOPRIVSNEEDED_MSG, Client_ID(from), Channel_Name(chan));

1 0

DNS : Increased maximum number of possible user and channel modes
by alex＠arthur.barton.de 19 Okt '12

19 Okt '12

Module: ngircd.git Branch: master Commit: 58abd0777b0924e5cb8fa6c01b56305d9b175608 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=58abd077… Author: DNS <dns(a)rbose.org> Date: Thu Oct 11 01:53:20 2012 +0200 Increased maximum number of possible user and channel modes Currntly ngIRCd supports 13 user and 15 channel modes, because there have been quite a few additions since our last release. But our data structures can only hold 15 user and -- even worse! -- only 9 channel modes! So enlarge the buffers to 20 bytes (actually 21 including NULL) to allow storing of all mode characters and to have some space left for more modes to come ... (cherry picked from commit 8996d777621d88d4bcc439ab4792b2814920687f) --- src/ngircd/defines.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ngircd/defines.h b/src/ngircd/defines.h index 977bc74..b387493 100644 --- a/src/ngircd/defines.h +++ b/src/ngircd/defines.h @@ -108,7 +108,7 @@ #define CLIENT_HOST_LEN 64 /** Max. length of all client modes (including NULL). */ -#define CLIENT_MODE_LEN 16 +#define CLIENT_MODE_LEN 21 /** Max. length of server info texts (including NULL). */ #define CLIENT_INFO_LEN 64 @@ -123,7 +123,7 @@ #define CHANNEL_NAME_LEN 51 /** Max. length of channel modes (including NULL). */ -#define CHANNEL_MODE_LEN 9 +#define CHANNEL_MODE_LEN 21 /** Max. IRC command length (including NULL), see. RFC 2812 section 3.2. */ #define COMMAND_LEN 513

1 0

DNS777 : Update error messages for user mode +b and channel Mode +M.
by alex＠arthur.barton.de 19 Okt '12

19 Okt '12

Module: ngircd.git Branch: master Commit: 3ee98d9f72449c88861744aebdd0a2e570bc3bc5 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=3ee98d9f… Author: DNS777 <dns(a)rbose.org> Date: Fri Oct 19 18:37:33 2012 +0200 Update error messages for user mode +b and channel Mode +M. Replaced error message for channel mode +M with ERR_NEEDREGGEDNICK_MSG (used by Bahamut, inspircd, ircu & Unreal too) and using numeric 477 and the msg simliar like inspircd. Replaced the error message ERR_CANNOTSENDTONICK_MSG for user mode +b with ERR_NONONREG_MSG and using numeric 486, similar like unrealircd. (cherry picked from commit 55a61ab17f63a9e757b7c7598c31b98ce5a132e8 and commit 3737d9ab7da1ea0485cefc07c65dc5308bf0db02) --- src/ngircd/channel.c | 6 +++++- src/ngircd/irc.c | 2 +- src/ngircd/messages.h | 3 ++- src/testsuite/message-test.e | 2 +- 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/src/ngircd/channel.c b/src/ngircd/channel.c index f3c74dc..00aafe0 100644 --- a/src/ngircd/channel.c +++ b/src/ngircd/channel.c @@ -918,7 +918,11 @@ Channel_Write(CHANNEL *Chan, CLIENT *From, CLIENT *Client, const char *Command, if (!Can_Send_To_Channel(Chan, From)) { if (! SendErrors) return CONNECTED; /* no error, see RFC 2812 */ - return IRC_WriteStrClient(From, ERR_CANNOTSENDTOCHAN_MSG, + if (strchr(Channel_Modes(Chan), 'M')) + return IRC_WriteStrClient(From, ERR_NEEDREGGEDNICK_MSG, + Client_ID(From), Channel_Name(Chan)); + else + return IRC_WriteStrClient(From, ERR_CANNOTSENDTOCHAN_MSG, Client_ID(From), Channel_Name(Chan)); } diff --git a/src/ngircd/irc.c b/src/ngircd/irc.c index 1a57bec..9d9d3f0 100644 --- a/src/ngircd/irc.c +++ b/src/ngircd/irc.c @@ -506,7 +506,7 @@ Send_Message(CLIENT * Client, REQUEST * Req, int ForceType, bool SendErrors) !(Client_Type(from) == CLIENT_SERVER) && !(Client_Type(from) == CLIENT_SERVICE)) { if (SendErrors && !IRC_WriteStrClient(from, - ERR_CANNOTSENDTONICK_MSG, + ERR_NONONREG_MSG, Client_ID(from), Client_ID(cl))) return DISCONNECTED; goto send_next_target; diff --git a/src/ngircd/messages.h b/src/ngircd/messages.h index 59e9605..a6a6d8c 100644 --- a/src/ngircd/messages.h +++ b/src/ngircd/messages.h @@ -136,6 +136,7 @@ #define ERR_BANNEDFROMCHAN_MSG "474 %s %s :Cannot join channel (+b) -- You are banned" #define ERR_BADCHANNELKEY_MSG "475 %s %s :Cannot join channel (+k) -- Wrong channel key" #define ERR_NOCHANMODES_MSG "477 %s %s :Channel doesn't support modes" +#define ERR_NEEDREGGEDNICK_MSG "477 %s %s :Cannot send to channel (+M) -- You need to be identified to a registered account to message this channel" #define ERR_LISTFULL_MSG "478 %s %s %s: Channel list is full (%d)" #define ERR_NOPRIVILEGES_MSG "481 %s :Permission denied" #define ERR_CHANOPRIVSNEEDED_MSG "482 %s %s :You are not channel operator" @@ -144,6 +145,7 @@ #define ERR_CANTKILLSERVER_MSG "483 %s :You can't kill a server!" #define ERR_RESTRICTED_MSG "484 %s :Your connection is restricted" #define ERR_NICKREGISTER_MSG "484 %s :Cannot modify user mode (+R) -- Use IRC services" +#define ERR_NONONREG_MSG "486 %s :Cannot send to user (+b) -- You must identify to a registered nick to private message %s" #define ERR_NOOPERHOST_MSG "491 %s :Not configured for your host" #define ERR_NOTONSAMECHANNEL_MSG "493 %s :You must share a common channel with %s" @@ -151,7 +153,6 @@ #define ERR_UMODEUNKNOWNFLAG2_MSG "501 %s :Unknown mode \"%c%c\"" #define ERR_USERSDONTMATCH_MSG "502 %s :Can't set/get mode for other users" #define ERR_NOINVITE_MSG "518 %s :Cannot invite to %s (+V)" -#define ERR_CANNOTSENDTONICK_MSG "976 %s :Cannot send to user (+b) -- Only registered users can message %s" #ifdef ZLIB # define RPL_STATSLINKINFOZIP_MSG "211 %s %s %d %ld %ld/%ld %ld %ld/%ld :%ld" diff --git a/src/testsuite/message-test.e b/src/testsuite/message-test.e index 4cbc066..6e63bb5 100644 --- a/src/testsuite/message-test.e +++ b/src/testsuite/message-test.e @@ -61,7 +61,7 @@ expect { send "privmsg nick :test\r" expect { timeout { exit 1 } - "976" + "486" } send "mode nick -b\r" expect {

1 0

Alexander Barton : Test suite: add more checks to whois-test.e
by alex＠arthur.barton.de 15 Okt '12

15 Okt '12

Module: ngircd.git Branch: master Commit: b1a5ade88f304d7e7c5a2c41511061141842dadd URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=b1a5ade8… Author: Alexander Barton <alex(a)barton.de> Date: Mon Oct 15 21:39:08 2012 +0200 Test suite: add more checks to whois-test.e --- src/testsuite/whois-test.e | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/src/testsuite/whois-test.e b/src/testsuite/whois-test.e index 2aed694..3c393e8 100644 --- a/src/testsuite/whois-test.e +++ b/src/testsuite/whois-test.e @@ -19,6 +19,10 @@ expect { timeout { exit 1 } "311 nick nick ~user localhost* \* :Real Name\r" } +expect { + timeout { exit 1 } + "318 nick nick :" +} send "whois *\r" expect { @@ -44,6 +48,16 @@ expect { "311 nick nick ~user localhost* \* :Real Name\r" } +send "whois unknown\r" +expect { + timeout { exit 1 } + "401 nick unknown :" +} +expect { + timeout { exit 1 } + "318 nick unknown :" +} + send "quit\r" expect { timeout { exit 1 }

1 0

Alexander Barton : Disable UID/GID checks on "single user OS"
by alex＠arthur.barton.de 11 Okt '12

11 Okt '12

Module: ngircd.git Branch: master Commit: e0da56fc7b1dae4e21dfda7e0ac8ad7594135986 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=e0da56fc… Author: Alexander Barton <alex(a)barton.de> Date: Thu Oct 11 14:54:13 2012 +0000 Disable UID/GID checks on "single user OS" Don't abort on "single user operating systems" that don't know more than one user account and therefore can't change user and group IDs. Currently, the only such system supported by ngIRCd is Haiku, a BeOS clone. --- src/ngircd/ngircd.c | 6 ++++++ src/portab/portab.h | 4 +++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/ngircd/ngircd.c b/src/ngircd/ngircd.c index 50d91ce..f016b6a 100644 --- a/src/ngircd/ngircd.c +++ b/src/ngircd/ngircd.c @@ -567,6 +567,8 @@ Setup_FDStreams(int fd) } /* Setup_FDStreams */ +#if !defined(SINGLE_USER_OS) + /** * Get user and group ID of unprivileged "nobody" user. * @@ -606,6 +608,8 @@ NGIRCd_getNobodyID(uid_t *uid, gid_t *gid ) return true; } /* NGIRCd_getNobodyID */ +#endif + static bool Random_Init_Kern(const char *file) @@ -692,6 +696,7 @@ NGIRCd_Init(bool NGIRCd_NoDaemon) } } +#if !defined(SINGLE_USER_OS) /* Check user ID */ if (Conf_UID == 0) { pwd = getpwuid(0); @@ -718,6 +723,7 @@ NGIRCd_Init(bool NGIRCd_NoDaemon) goto out; } } +#endif /* Change user ID */ if (getuid() != Conf_UID) { diff --git a/src/portab/portab.h b/src/portab/portab.h index 1c6e3f8..208d350 100644 --- a/src/portab/portab.h +++ b/src/portab/portab.h @@ -112,7 +112,6 @@ typedef unsigned char bool; /* SPLint */ - #ifdef S_SPLINT_S #include "splint.h" #endif @@ -132,6 +131,9 @@ typedef unsigned char bool; #define HOST_VENDOR "unknown" #endif +#ifdef __HAIKU__ +#define SINGLE_USER_OS +#endif /* configure options */

1 0

Alexander Barton : Add "i586/pc/haiku" to doc/Platforms.txt
by alex＠arthur.barton.de 11 Okt '12

11 Okt '12

Module: ngircd.git Branch: master Commit: 73229249d893f05f4b2d98c41a5a4839100c0c9e URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=73229249… Author: Alexander Barton <alex(a)barton.de> Date: Thu Oct 11 15:05:21 2012 +0000 Add "i586/pc/haiku" to doc/Platforms.txt --- doc/Platforms.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/doc/Platforms.txt b/doc/Platforms.txt index b8e33b5..44c9000 100644 --- a/doc/Platforms.txt +++ b/doc/Platforms.txt @@ -49,6 +49,7 @@ i386/unknown/netbsdelf4.0 gcc 4.1.2 19 12-02-29 alex Y Y Y Y (3) i386/unknown/netbsdelf5.0.2 gcc 4.1.3 19 12-02-26 alex Y Y Y Y (3) i386/unknown/openbsd3.9 gcc 3.3.5 0.10.0-p1 06-08-30 alex Y Y Y Y (3) i386/unknown/openbsd4.1 gcc 3.3.5 16 10-04-11 alex Y Y Y Y (3) +i586/pc/haiku gcc 2.95.3 19.2~138 12-10-11 user Y Y N N i586/pc/interix3.5 gcc 3.3 19 12-02-29 alex Y Y N Y i686/pc/cygwin gcc 3.3.1 0.8.0 04-05-30 alex Y Y N Y i686/pc/linux-gnu gcc 2.7.2 19.1 12-05-30 goetz Y Y Y Y (1)

1 0

Alexander Barton : Search gethostbyname() in libbind and libnetwork
by alex＠arthur.barton.de 11 Okt '12

11 Okt '12

Module: ngircd.git Branch: master Commit: cdaaae0cb2c2b30db8bb61506a826ff87c58f7c8 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=cdaaae0c… Author: Alexander Barton <alex(a)barton.de> Date: Thu Oct 11 14:50:45 2012 +0000 Search gethostbyname() in libbind and libnetwork This is required for Haiku (BeOS clone) at least. --- configure.ng | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configure.ng b/configure.ng index a3cab6a..4f0a14e 100644 --- a/configure.ng +++ b/configure.ng @@ -164,11 +164,11 @@ AC_SEARCH_LIBS([memmove], [UTIL], [], [ AC_MSG_ERROR([unable to find the memmove() function]) ]) # gethostbyname: Solaris libnsl -AC_SEARCH_LIBS([gethostbyname], [nsl], [], [ +AC_SEARCH_LIBS([gethostbyname], [bind nsl network], [], [ AC_MSG_ERROR([unable to find the gethostbyname() function]) ]) # bind: SVR4 libsocket -AC_SEARCH_LIBS([bind], [socket], [], [ +AC_SEARCH_LIBS([bind], [socket network], [], [ AC_MSG_ERROR([unable to find the bind() function]) ])

1 0

Alexander Barton : Update manual pages
by alex＠arthur.barton.de 09 Okt '12

09 Okt '12

Module: ngircd.git Branch: master Commit: c319fb8eaa859e1c5b4e0333abf4dabf6023708d URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=c319fb8e… Author: Alexander Barton <alex(a)barton.de> Date: Tue Oct 9 13:13:01 2012 +0200 Update manual pages Among other little things, bring project description in line with website. --- man/ngircd.8.tmpl | 29 +++++++++++++++++------------ man/ngircd.conf.5.tmpl | 2 +- 2 files changed, 18 insertions(+), 13 deletions(-) diff --git a/man/ngircd.8.tmpl b/man/ngircd.8.tmpl index f0703f3..318c045 100644 --- a/man/ngircd.8.tmpl +++ b/man/ngircd.8.tmpl @@ -1,30 +1,35 @@ .\" .\" ngircd(8) manual page template .\" -.TH ngircd 8 "Mar 2012" ngircd "ngIRCd Manual" +.TH ngircd 8 "Oct 2012" ngIRCd "ngIRCd Manual" .SH NAME -ngIRCd \- the next generation IRC daemon +ngIRCd \- the "next generation" IRC daemon .SH SYNOPSIS -.B ngircd [ +.B ngircd +[ .I Options -.B ] +] .SH DESCRIPTION .BR ngIRCd -is a free open source daemon for the Internet Relay Chat (IRC), -developed under the GNU General Public License (GPL). +is a free, portable and lightweight Internet Relay Chat server for small +or private networks, developed under the GNU General Public License (GPL). +It is easy to configure, can cope with dynamic IP addresses, and supports +IPv6, SSL-protected connections as well as PAM for authentication. +It is written from scratch and not based on the original IRCd. .PP -It's written from scratch and is not based upon the original IRCd like -many others. It is easy to configure, supports server links (even with -original ircd's) and runs on hosts with changing IP addresses (such as -dial-in networks). +The name ngIRCd means +.IR "next generation IRC daemon", +which is a little bit exaggerated: +.IR "lightweight Internet Relay Chat server" +most probably would have been a better name :-) .PP Currently supported platforms include AIX, A/UX, FreeBSD, HP-UX, IRIX, Linux, Mac OS X, NetBSD, OpenBSD, Solaris, and Windows with Cygwin. .PP As ngIRCd relies on UNIX standards and uses GNU automake and GNU autoconf there are good chances that it also supports other UNIX-based operating -systems as well. By default, ngIRCd writes diagnostic and informational messages using -the syslog mechanism. +systems as well. By default, ngIRCd writes diagnostic and informational +messages using the syslog mechanism. .SH OPTIONS The default behavior of .BR ngircd diff --git a/man/ngircd.conf.5.tmpl b/man/ngircd.conf.5.tmpl index c03cf74..5f9d6dd 100644 --- a/man/ngircd.conf.5.tmpl +++ b/man/ngircd.conf.5.tmpl @@ -1,7 +1,7 @@ .\" .\" ngircd.conf(5) manual page template .\" -.TH ngircd.conf 5 "Mar 2012" ngircd "ngIRCd Manual" +.TH ngircd.conf 5 "Oct 2012" ngIRCd "ngIRCd Manual" .SH NAME ngircd.conf \- configuration file of ngIRCd .SH SYNOPSIS

1 0