- ngIRCd GIT Updates - lists.barton.de

Alexander Barton : Fix prefix of "halfop" when "multi-prefix" is active
by alex＠arthur.barton.de 23 Sep '12

23 Sep '12

Module: ngircd.git Branch: master Commit: fc39146f48f556de0a26693cd4275667d3f82ab2 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=fc39146f… Author: Alexander Barton <alex(a)barton.de> Date: Sun Sep 23 19:23:23 2012 +0200 Fix prefix of "halfop" when "multi-prefix" is active --- src/ngircd/irc-info.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ngircd/irc-info.c b/src/ngircd/irc-info.c index a1bebb4..b4c951f 100644 --- a/src/ngircd/irc-info.c +++ b/src/ngircd/irc-info.c @@ -820,7 +820,7 @@ who_flags_qualifier(CLIENT *Client, const char *chan_user_modes, char *str, size if (strchr(chan_user_modes, 'o')) strlcat(str, "@", len); if (strchr(chan_user_modes, 'h')) - strlcat(str, "&", len); + strlcat(str, "%", len); if (strchr(chan_user_modes, 'v')) strlcat(str, "+", len);

1 0

Alexander Barton : Clean up doc/.gitignore
by alex＠arthur.barton.de 23 Sep '12

23 Sep '12

Module: ngircd.git Branch: master Commit: 1744a8d145c35edbb4abf093dd7336ecde4965d5 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=1744a8d1… Author: Alexander Barton <alex(a)barton.de> Date: Sun Sep 23 17:52:53 2012 +0200 Clean up doc/.gitignore --- doc/.gitignore | 1 - 1 file changed, 1 deletion(-) diff --git a/doc/.gitignore b/doc/.gitignore index a7b6a22..0035855 100644 --- a/doc/.gitignore +++ b/doc/.gitignore @@ -1,2 +1 @@ sample-ngircd.conf -Add_Modes.txt

1 0

Alexander Barton : Fix some "whitespace glitches"
by alex＠arthur.barton.de 23 Sep '12

23 Sep '12

Module: ngircd.git Branch: master Commit: 0d67be3f301e280225d8a04048ebb77a976d8169 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=0d67be3f… Author: Alexander Barton <alex(a)barton.de> Date: Tue Sep 11 12:48:51 2012 +0200 Fix some "whitespace glitches" Some have been introduced by commit 7b01bb83, some are older. --- src/ngircd/channel.c | 2 +- src/ngircd/irc-info.c | 18 +++++++++--------- src/ngircd/irc-mode.c | 4 ++-- src/ngircd/irc-server.c | 14 +++++++------- 4 files changed, 19 insertions(+), 19 deletions(-) diff --git a/src/ngircd/channel.c b/src/ngircd/channel.c index 8d001a8..59fe002 100644 --- a/src/ngircd/channel.c +++ b/src/ngircd/channel.c @@ -362,7 +362,7 @@ Channel_Kick(CLIENT *Peer, CLIENT *Target, CLIENT *Origin, const char *Name, } ptr++; } - + if(!can_kick) { IRC_WriteStrClient(Origin, ERR_CHANOPPRIVTOLOW_MSG, Client_ID(Origin), Name); diff --git a/src/ngircd/irc-info.c b/src/ngircd/irc-info.c index 7a122ef..a1bebb4 100644 --- a/src/ngircd/irc-info.c +++ b/src/ngircd/irc-info.c @@ -117,7 +117,7 @@ IRC_INFO(CLIENT * Client, REQUEST * Req) target = Client_Search(Req->argv[0]); else target = Client_ThisServer(); - + /* Make sure that the target is a server */ if (target && Client_Type(target) != CLIENT_SERVER) target = Client_Introducer(target); @@ -811,8 +811,8 @@ static char * who_flags_qualifier(CLIENT *Client, const char *chan_user_modes, char *str, size_t len) { assert(Client != NULL); - - if (Client_Cap(Client) & CLIENT_CAP_MULTI_PREFIX) { + + if (Client_Cap(Client) & CLIENT_CAP_MULTI_PREFIX) { if (strchr(chan_user_modes, 'q')) strlcat(str, "~", len); if (strchr(chan_user_modes, 'a')) @@ -823,10 +823,10 @@ who_flags_qualifier(CLIENT *Client, const char *chan_user_modes, char *str, size strlcat(str, "&", len); if (strchr(chan_user_modes, 'v')) strlcat(str, "+", len); - + return str; } - + if (strchr(chan_user_modes, 'q')) strlcat(str, "~", len); else if (strchr(chan_user_modes, 'a')) @@ -837,7 +837,7 @@ who_flags_qualifier(CLIENT *Client, const char *chan_user_modes, char *str, size strlcat(str, "%", len); else if (strchr(chan_user_modes, 'v')) strlcat(str, "+", len); - + return str; } @@ -890,7 +890,7 @@ IRC_WHO_Channel(CLIENT *Client, CHANNEL *Chan, bool OnlyOps) chan_user_modes = Channel_UserModes(Chan, c); who_flags_qualifier(c, chan_user_modes, flags, sizeof(flags)); - + if (!write_whoreply(Client, c, Channel_Name(Chan), flags)) return DISCONNECTED; @@ -1479,7 +1479,7 @@ IRC_Send_LUSERS(CLIENT *Client) Conn_CountMax(), Conn_CountAccepted())) return DISCONNECTED; #endif - + return CONNECTED; } /* IRC_Send_LUSERS */ @@ -1609,7 +1609,7 @@ IRC_Send_NAMES(CLIENT * Client, CHANNEL * Chan) if (is_member || is_visible) { if (str[strlen(str) - 1] != ':') strlcat(str, " ", sizeof(str)); - + who_flags_qualifier(cl, Channel_UserModes(Chan, cl), str, sizeof(str)); strlcat(str, Client_ID(cl), sizeof(str)); diff --git a/src/ngircd/irc-mode.c b/src/ngircd/irc-mode.c index f394634..7380c6e 100644 --- a/src/ngircd/irc-mode.c +++ b/src/ngircd/irc-mode.c @@ -441,7 +441,7 @@ Channel_Mode(CLIENT *Client, REQUEST *Req, CLIENT *Origin, CHANNEL *Channel) if(Client_OperByMe(Client) && Conf_OperCanMode) { is_oper = true; } - + /* Check if client is a server/service */ if(Client_Type(Client) == CLIENT_SERVER || Client_Type(Client) == CLIENT_SERVICE) { @@ -527,7 +527,7 @@ Channel_Mode(CLIENT *Client, REQUEST *Req, CLIENT *Origin, CHANNEL *Channel) /* Are there arguments left? */ if (arg_arg >= Req->argc) arg_arg = -1; - + if(!is_machine) { o_mode_ptr = Channel_UserModes(Channel, Client); while( *o_mode_ptr ) { diff --git a/src/ngircd/irc-server.c b/src/ngircd/irc-server.c index f9182d9..380ab62 100644 --- a/src/ngircd/irc-server.c +++ b/src/ngircd/irc-server.c @@ -54,7 +54,7 @@ IRC_SERVER( CLIENT *Client, REQUEST *Req ) CLIENT *from, *c; int i; CONN_ID con; - + assert( Client != NULL ); assert( Req != NULL ); @@ -88,7 +88,7 @@ IRC_SERVER( CLIENT *Client, REQUEST *Req ) Conn_Close( Client_Conn( Client ), NULL, "Bad password", true); return DISCONNECTED; } - + /* Is there a registered server with this ID? */ if( ! Client_CheckID( Client, Req->argv[0] )) return DISCONNECTED; @@ -206,7 +206,7 @@ IRC_NJOIN( CLIENT *Client, REQUEST *Req ) bool is_owner, is_chanadmin, is_op, is_halfop, is_voiced; CHANNEL *chan; CLIENT *c; - + assert( Client != NULL ); assert( Req != NULL ); @@ -220,11 +220,11 @@ IRC_NJOIN( CLIENT *Client, REQUEST *Req ) while( ptr ) { is_op = is_voiced = false; - + /* cut off prefixes */ while(( *ptr == '~') || ( *ptr == '&' ) || ( *ptr == '@' ) || ( *ptr == '%') || ( *ptr == '+' )) - { + { if( *ptr == '~' ) is_owner = true; if( *ptr == '&' ) is_chanadmin = true; if( *ptr == '@' ) is_op = true; @@ -239,7 +239,7 @@ IRC_NJOIN( CLIENT *Client, REQUEST *Req ) Channel_Join( c, channame ); chan = Channel_Search( channame ); assert( chan != NULL ); - + if( is_owner ) Channel_UserModeAdd( chan, c, 'q' ); if( is_chanadmin ) Channel_UserModeAdd( chan, c, 'a' ); if( is_op ) Channel_UserModeAdd( chan, c, 'o' ); @@ -266,7 +266,7 @@ IRC_NJOIN( CLIENT *Client, REQUEST *Req ) strlcat( nick_out, ptr, sizeof( nick_out )); } else Log( LOG_ERR, "Got NJOIN for unknown nick \"%s\" for channel \"%s\"!", ptr, channame ); - + /* search for next Nick */ ptr = strtok( NULL, "," ); }

1 0

Alexander Barton : doc/Modes.txt: add version number to new channel modes
by alex＠arthur.barton.de 23 Sep '12

23 Sep '12

Module: ngircd.git Branch: master Commit: b12acddf4fd143a91a825ba40ef0a15d7f2c3e4a URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=b12acddf… Author: Alexander Barton <alex(a)barton.de> Date: Sun Sep 23 17:52:26 2012 +0200 doc/Modes.txt: add version number to new channel modes --- doc/Modes.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/Modes.txt b/doc/Modes.txt index dec80ce..e3b754d 100644 --- a/doc/Modes.txt +++ b/doc/Modes.txt @@ -68,11 +68,11 @@ channel of which he is a member. mode since description - q 20? User is channel owner can only be set by a service, other + q 20 User is channel owner can only be set by a service, other owner and irc op. Can promote other users to q, a, o, h, v. - a 20? User is channel admin and can promote other users to v, h, o + a 20 User is channel admin and can promote other users to v, h, o o 0.2.0 User is channel operator and can op/kick/... other members. - h 20? User is half op and can set channel modes imntvIbek and kick + h 20 User is half op and can set channel modes imntvIbek and kick voiced and normal users. v 0.2.0 User is "voiced" and can speak even if channel is moderated.

1 0

Sebastian Köhler : Implemented xop support
by alex＠arthur.barton.de 23 Sep '12

23 Sep '12

Module: ngircd.git Branch: master Commit: 7b01bb833f5bc3386611dc0c015a99c236e941f6 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=7b01bb83… Author: Sebastian Köhler <sebkoehler(a)whoami.org.uk> Date: Sat Aug 4 14:19:58 2012 +0200 Implemented xop support 3 new channel user modes have been added. Half Op: +h(Prefix: %) can set the channel modes +imntvIbek and kick all +v and normal users. Admin: +a(Prefix: &) can set channel modes +imntvIbekoRsz and kick all +o, +h, +v and normal users. Owner: +q(Prefix: ~) can set channel modes +imntvIbekoRsz and kick all +a, +o, +h, +v and normal users --- doc/.gitignore | 1 + src/ngircd/channel.c | 119 ++++++++++++++++++---------------------- src/ngircd/defines.h | 2 +- src/ngircd/irc-channel.c | 19 ++++--- src/ngircd/irc-info.c | 62 +++++++++++---------- src/ngircd/irc-mode.c | 136 +++++++++++++++++++++++++++++++++------------- src/ngircd/irc-op.c | 7 ++- src/ngircd/irc-server.c | 16 +++++- src/ngircd/messages.h | 3 +- src/ngircd/numeric.c | 11 +++- 10 files changed, 228 insertions(+), 148 deletions(-) Diff: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commitdiff;h=7b01…

1 0

Sebastian Köhler : Tests and documentation for xop
by alex＠arthur.barton.de 23 Sep '12

23 Sep '12

Module: ngircd.git Branch: master Commit: 097c72aa65d9914d688eaece718648ca060e287a URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=097c72aa… Author: Sebastian Köhler <sebkoehler(a)whoami.org.uk> Date: Sun Aug 5 23:38:47 2012 +0200 Tests and documentation for xop --- doc/Modes.txt | 5 ++++ src/testsuite/mode-test.e | 68 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 73 insertions(+) diff --git a/doc/Modes.txt b/doc/Modes.txt index e47e270..d61bd2d 100644 --- a/doc/Modes.txt +++ b/doc/Modes.txt @@ -66,7 +66,12 @@ channel of which he is a member. mode since description + q 20? User is channel owner can only be set by a service, other + owner and irc op. Can promote other users to q, a, o, h, v. + a 20? User is channel admin and can promote other users to v, h, o o 0.2.0 User is channel operator and can op/kick/... other members. + h 20? User is half op and can set channel modes imntvIbek and kick + voiced and normal users. v 0.2.0 User is "voiced" and can speak even if channel is moderated. diff --git a/src/testsuite/mode-test.e b/src/testsuite/mode-test.e index 260cd03..44b6e5d 100644 --- a/src/testsuite/mode-test.e +++ b/src/testsuite/mode-test.e @@ -31,6 +31,46 @@ expect { "@* MODE nick :-i" } +send "join #usermode\r" +expect { + timeout { exit 1 } + "@* JOIN :#usermode" +} +expect { + timeout { exit 1 } + "366" +} + +send "mode #usermode +v nick\r" +expect { + timeout { exit 1 } + "@* MODE #usermode +v nick\r" +} + +send "mode #usermode +h nick\r" +expect { + timeout { exit 1 } + "@* MODE #usermode +h nick\r" +} + +send "mode #usermode +a nick\r" +expect { + timeout { exit 1 } + "482 nick" +} + +send "mode #usermode +q nick\r" +expect { + timeout { exit 1 } + "482 nick" +} + +send "mode #usermode -vho nick nick nick\r" +expect { + timeout { exit 1 } + "@* MODE #usermode -vho nick nick nick" +} + send "oper TestOp 123\r" expect { timeout { exit 1 } @@ -47,6 +87,34 @@ expect { "221 nick +o" } +send "mode #usermode +a nick\r" +expect { + timeout { exit 1 } + "@* MODE #usermode +a nick" +} + +send "mode #usermode +q nick\r" +expect { + timeout { exit 1 } + "@* MODE #usermode +q nick" +} + +send "names #usermode\r" +expect { + timeout { exit 1 } + "353 nick = #usermode :~nick" +} +expect { + timeout { exit 1 } + "366 nick #usermode" +} + +send "part #usermode\r" +expect { + timeout { exit 1 } + "@* PART #usermode" +} + send "join #channel\r" expect { timeout { exit 1 }

1 0

Alexander Barton : Merge branch 'xop' of https://github.com/kart0ffelsack/ ngircd into bug92-xop
by alex＠arthur.barton.de 23 Sep '12

23 Sep '12

Module: ngircd.git Branch: master Commit: f37600ee01f6cfd86e8fa80f77ee26ebaf3012b2 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=f37600ee… Author: Alexander Barton <alex(a)barton.de> Date: Tue Sep 11 12:30:19 2012 +0200 Merge branch 'xop' of https://github.com/kart0ffelsack/ngircd into bug92-xop * 'xop' of https://github.com/kart0ffelsack/ngircd: Tests and documentation for xop Implemented xop support Conflicts (because of merge of the 'cmode-M' branch): src/ngircd/channel.c src/ngircd/defines.h src/ngircd/messages.h ---

1 0

Alexander Barton : Free all listen ports on initialization
by alex＠arthur.barton.de 21 Sep '12

21 Sep '12

Module: ngircd.git Branch: master Commit: ef82ef4ddb8b93e3d02197ffeed977d76dd99ba5 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=ef82ef4d… Author: Alexander Barton <alex(a)barton.de> Date: Fri Sep 21 10:41:03 2012 +0200 Free all listen ports on initialization Now you can reconfigure listen ports and reload the server configuration on runtime. Without this patch, no ports could be removed. --- src/ngircd/conf.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/ngircd/conf.c b/src/ngircd/conf.c index 5853926..0052de8 100644 --- a/src/ngircd/conf.c +++ b/src/ngircd/conf.c @@ -104,6 +104,8 @@ ConfSSL_Init(void) free(Conf_SSLOptions.DHFile); Conf_SSLOptions.DHFile = NULL; array_free_wipe(&Conf_SSLOptions.KeyFilePassword); + + array_free(&Conf_SSLOptions.ListenPorts); } /** @@ -689,6 +691,7 @@ Set_Defaults(bool InitServers) PACKAGE_NAME, PACKAGE_VERSION); free(Conf_ListenAddress); Conf_ListenAddress = NULL; + array_free(&Conf_ListenPorts); array_free(&Conf_Motd); strlcpy(Conf_MotdFile, SYSCONFDIR, sizeof(Conf_MotdFile)); strlcat(Conf_MotdFile, MOTD_FILE, sizeof(Conf_MotdFile));

1 0

Alexander Barton : Initialize SSL when needed only, and disable SSL on errors
by alex＠arthur.barton.de 21 Sep '12

21 Sep '12

Module: ngircd.git Branch: master Commit: bb20aeb9bcbb27eda540a6df2faf2d07e71d23f3 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=bb20aeb9… Author: Alexander Barton <alex(a)barton.de> Date: Fri Sep 21 10:36:09 2012 +0200 Initialize SSL when needed only, and disable SSL on errors With this patch, the SSL subsystem will only be initialized if at least one SSL ports is configured; so you won't get "SSL initialization failed" messages if you didn't configured it at all. And if SSL initialization fails, no SSL listen ports will be enabled later which never could establish a working SSL connection at all ... --- src/ngircd/conn-ssl.c | 15 ++++++++++++--- src/ngircd/ngircd.c | 2 +- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/src/ngircd/conn-ssl.c b/src/ngircd/conn-ssl.c index 8f7b70a..914d016 100644 --- a/src/ngircd/conn-ssl.c +++ b/src/ngircd/conn-ssl.c @@ -241,6 +241,9 @@ void ConnSSL_Free(CONNECTION *c) bool ConnSSL_InitLibrary( void ) { + if (!array_bytes(&Conf_SSLOptions.ListenPorts)) + return true; + #ifdef HAVE_LIBSSL SSL_CTX *newctx; @@ -256,12 +259,14 @@ ConnSSL_InitLibrary( void ) * According to OpenSSL RAND_egd(3): "The automatic query of /var/run/egd-pool et al was added in OpenSSL 0.9.7"; * so it makes little sense to deal with PRNGD seeding ourselves. */ + array_free(&Conf_SSLOptions.ListenPorts); return false; } newctx = SSL_CTX_new(SSLv23_method()); if (!newctx) { LogOpenSSLError("SSL_CTX_new()", NULL); + array_free(&Conf_SSLOptions.ListenPorts); return false; } @@ -276,6 +281,7 @@ ConnSSL_InitLibrary( void ) return true; out: SSL_CTX_free(newctx); + array_free(&Conf_SSLOptions.ListenPorts); return false; #endif #ifdef HAVE_LIBGNUTLS @@ -287,10 +293,13 @@ out: err = gnutls_global_init(); if (err) { Log(LOG_ERR, "gnutls_global_init(): %s", gnutls_strerror(err)); + array_free(&Conf_SSLOptions.ListenPorts); return false; } - if (!ConnSSL_LoadServerKey_gnutls()) + if (!ConnSSL_LoadServerKey_gnutls()) { + array_free(&Conf_SSLOptions.ListenPorts); return false; + } Log(LOG_INFO, "gnutls %s initialized.", gnutls_check_version(NULL)); initialized = true; return true; @@ -313,7 +322,7 @@ ConnSSL_LoadServerKey_gnutls(void) cert_file = Conf_SSLOptions.CertFile ? Conf_SSLOptions.CertFile:Conf_SSLOptions.KeyFile; if (!cert_file) { - Log(LOG_NOTICE, "No SSL server key configured, SSL disabled."); + Log(LOG_ERR, "No SSL server key configured!"); return false; } @@ -344,7 +353,7 @@ ConnSSL_LoadServerKey_openssl(SSL_CTX *ctx) assert(ctx); if (!Conf_SSLOptions.KeyFile) { - Log(LOG_NOTICE, "No SSL server key configured, SSL disabled."); + Log(LOG_ERR, "No SSL server key configured!"); return false; } diff --git a/src/ngircd/ngircd.c b/src/ngircd/ngircd.c index 585e2ac..a4c2fe8 100644 --- a/src/ngircd/ngircd.c +++ b/src/ngircd/ngircd.c @@ -662,7 +662,7 @@ NGIRCd_Init(bool NGIRCd_NoDaemon) /* SSL initialization */ if (!ConnSSL_InitLibrary()) Log(LOG_WARNING, - "Warning: Error during SSL initialization, continuing ..."); + "Error during SSL initialization, continuing without SSL ..."); /* Change root */ if (Conf_Chroot[0]) {

1 0

Alexander Barton : Sort "feature string" alphabetically
by alex＠arthur.barton.de 17 Sep '12

17 Sep '12

Module: ngircd.git Branch: master Commit: 1413a4886ffa120e82d4963368e82b4d5ec6eb2d URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=1413a488… Author: Alexander Barton <alex(a)barton.de> Date: Mon Sep 17 00:55:30 2012 +0200 Sort "feature string" alphabetically --- src/ngircd/ngircd.c | 123 +++++++++++++++++++++++++++++++-------------------- 1 file changed, 76 insertions(+), 47 deletions(-) diff --git a/src/ngircd/ngircd.c b/src/ngircd/ngircd.c index 7397ee0..585e2ac 100644 --- a/src/ngircd/ngircd.c +++ b/src/ngircd/ngircd.c @@ -347,70 +347,99 @@ main(int argc, const char *argv[]) * line switch. */ static void -Fill_Version( void ) +Fill_Version(void) { NGIRCd_VersionAddition[0] = '\0'; -#ifdef SYSLOG - strlcpy( NGIRCd_VersionAddition, "SYSLOG", sizeof NGIRCd_VersionAddition ); -#endif -#ifdef ZLIB - if( NGIRCd_VersionAddition[0] ) - strlcat( NGIRCd_VersionAddition, "+", sizeof NGIRCd_VersionAddition ); - strlcat( NGIRCd_VersionAddition, "ZLIB", sizeof NGIRCd_VersionAddition ); +#ifdef DEBUG + if (NGIRCd_VersionAddition[0]) + strlcat(NGIRCd_VersionAddition, "+", + sizeof NGIRCd_VersionAddition); + strlcat(NGIRCd_VersionAddition, "DEBUG", + sizeof NGIRCd_VersionAddition); #endif -#ifdef SSL_SUPPORT - if ( NGIRCd_VersionAddition[0] ) strlcat( NGIRCd_VersionAddition, "+", sizeof NGIRCd_VersionAddition ); - strlcat( NGIRCd_VersionAddition, "SSL", sizeof NGIRCd_VersionAddition ); +#ifdef IDENTAUTH + if (NGIRCd_VersionAddition[0]) + strlcat(NGIRCd_VersionAddition, "+", + sizeof NGIRCd_VersionAddition); + strlcat(NGIRCd_VersionAddition, "IDENT", + sizeof NGIRCd_VersionAddition); #endif -#ifdef TCPWRAP - if( NGIRCd_VersionAddition[0] ) - strlcat( NGIRCd_VersionAddition, "+", sizeof NGIRCd_VersionAddition ); - strlcat( NGIRCd_VersionAddition, "TCPWRAP", sizeof NGIRCd_VersionAddition ); +#ifdef WANT_IPV6 + if (NGIRCd_VersionAddition[0]) + strlcat(NGIRCd_VersionAddition, "+", + sizeof(NGIRCd_VersionAddition)); + strlcat(NGIRCd_VersionAddition, "IPv6", + sizeof(NGIRCd_VersionAddition)); #endif -#ifdef IDENTAUTH - if( NGIRCd_VersionAddition[0] ) - strlcat( NGIRCd_VersionAddition, "+", sizeof NGIRCd_VersionAddition ); - strlcat( NGIRCd_VersionAddition, "IDENT", sizeof NGIRCd_VersionAddition ); +#ifdef IRCPLUS + if (NGIRCd_VersionAddition[0]) + strlcat(NGIRCd_VersionAddition, "+", + sizeof NGIRCd_VersionAddition); + strlcat(NGIRCd_VersionAddition, "IRCPLUS", + sizeof NGIRCd_VersionAddition); #endif #ifdef PAM if (NGIRCd_VersionAddition[0]) - strlcat(NGIRCd_VersionAddition, "+", sizeof NGIRCd_VersionAddition); - strlcat(NGIRCd_VersionAddition, "PAM", sizeof NGIRCd_VersionAddition); + strlcat(NGIRCd_VersionAddition, "+", + sizeof NGIRCd_VersionAddition); + strlcat(NGIRCd_VersionAddition, "PAM", + sizeof NGIRCd_VersionAddition); #endif -#ifdef DEBUG - if( NGIRCd_VersionAddition[0] ) - strlcat( NGIRCd_VersionAddition, "+", sizeof NGIRCd_VersionAddition ); - strlcat( NGIRCd_VersionAddition, "DEBUG", sizeof NGIRCd_VersionAddition ); +#ifdef STRICT_RFC + if (NGIRCd_VersionAddition[0]) + strlcat(NGIRCd_VersionAddition, "+", + sizeof NGIRCd_VersionAddition); + strlcat(NGIRCd_VersionAddition, "RFC", + sizeof NGIRCd_VersionAddition); #endif #ifdef SNIFFER - if( NGIRCd_VersionAddition[0] ) - strlcat( NGIRCd_VersionAddition, "+", sizeof NGIRCd_VersionAddition ); - strlcat( NGIRCd_VersionAddition, "SNIFFER", sizeof NGIRCd_VersionAddition ); + if (NGIRCd_VersionAddition[0]) + strlcat(NGIRCd_VersionAddition, "+", + sizeof NGIRCd_VersionAddition); + strlcat(NGIRCd_VersionAddition, "SNIFFER", + sizeof NGIRCd_VersionAddition); #endif -#ifdef STRICT_RFC - if( NGIRCd_VersionAddition[0] ) - strlcat( NGIRCd_VersionAddition, "+", sizeof NGIRCd_VersionAddition ); - strlcat( NGIRCd_VersionAddition, "RFC", sizeof NGIRCd_VersionAddition ); +#ifdef SSL_SUPPORT + if (NGIRCd_VersionAddition[0]) + strlcat(NGIRCd_VersionAddition, "+", + sizeof NGIRCd_VersionAddition); + strlcat(NGIRCd_VersionAddition, "SSL", + sizeof NGIRCd_VersionAddition); #endif -#ifdef IRCPLUS - if( NGIRCd_VersionAddition[0] ) - strlcat( NGIRCd_VersionAddition, "+", sizeof NGIRCd_VersionAddition ); - strlcat( NGIRCd_VersionAddition, "IRCPLUS", sizeof NGIRCd_VersionAddition ); +#ifdef SYSLOG + if (NGIRCd_VersionAddition[0]) + strlcat(NGIRCd_VersionAddition, "+", + sizeof NGIRCd_VersionAddition); + strlcat(NGIRCd_VersionAddition, "SYSLOG", + sizeof NGIRCd_VersionAddition); #endif -#ifdef WANT_IPV6 +#ifdef TCPWRAP if (NGIRCd_VersionAddition[0]) - strlcat(NGIRCd_VersionAddition, "+", sizeof(NGIRCd_VersionAddition)); - strlcat(NGIRCd_VersionAddition, "IPv6", sizeof(NGIRCd_VersionAddition)); + strlcat(NGIRCd_VersionAddition, "+", + sizeof NGIRCd_VersionAddition); + strlcat(NGIRCd_VersionAddition, "TCPWRAP", + sizeof NGIRCd_VersionAddition); #endif - if( NGIRCd_VersionAddition[0] ) - strlcat( NGIRCd_VersionAddition, "-", sizeof( NGIRCd_VersionAddition )); - - strlcat( NGIRCd_VersionAddition, HOST_CPU, sizeof( NGIRCd_VersionAddition )); - strlcat( NGIRCd_VersionAddition, "/", sizeof( NGIRCd_VersionAddition )); - strlcat( NGIRCd_VersionAddition, HOST_VENDOR, sizeof( NGIRCd_VersionAddition )); - strlcat( NGIRCd_VersionAddition, "/", sizeof( NGIRCd_VersionAddition )); - strlcat( NGIRCd_VersionAddition, HOST_OS, sizeof( NGIRCd_VersionAddition )); +#ifdef ZLIB + if (NGIRCd_VersionAddition[0]) + strlcat(NGIRCd_VersionAddition, "+", + sizeof NGIRCd_VersionAddition); + strlcat(NGIRCd_VersionAddition, "ZLIB", + sizeof NGIRCd_VersionAddition); +#endif + if (NGIRCd_VersionAddition[0]) + strlcat(NGIRCd_VersionAddition, "-", + sizeof(NGIRCd_VersionAddition)); + + strlcat(NGIRCd_VersionAddition, HOST_CPU, + sizeof(NGIRCd_VersionAddition)); + strlcat(NGIRCd_VersionAddition, "/", sizeof(NGIRCd_VersionAddition)); + strlcat(NGIRCd_VersionAddition, HOST_VENDOR, + sizeof(NGIRCd_VersionAddition)); + strlcat(NGIRCd_VersionAddition, "/", sizeof(NGIRCd_VersionAddition)); + strlcat(NGIRCd_VersionAddition, HOST_OS, + sizeof(NGIRCd_VersionAddition)); snprintf(NGIRCd_Version, sizeof NGIRCd_Version, "%s %s-%s", PACKAGE_NAME, PACKAGE_VERSION, NGIRCd_VersionAddition);

1 0