Mai 2010 - ngIRCd GIT Updates

Florian Westphal : Revert "configure: make implicit declarations fatal"
by fw＠arthur.barton.de 29 Mai '10

29 Mai '10

Module: ngircd.git Branch: master Commit: ad1370d18cc32e1cb24e173f178278d140567c95 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=ad1370d1… Author: Florian Westphal <fw(a)strlen.de> Date: Sat May 29 18:47:27 2010 +0200 Revert "configure: make implicit declarations fatal" This reverts commit b3a6c33da0b12ba74dc395979b677813d4bc2c0f. apparently not all gcc versions support this 8-( --- configure.in | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/configure.in b/configure.in index 8526af6..6d9312d 100644 --- a/configure.in +++ b/configure.in @@ -542,7 +542,6 @@ AC_DEFINE_UNQUOTED(TARGET_OS, "$target_os" ) # Add additional CFLAGS, eventually specified on the command line, but after # running this configure script. Useful for "-Werror" for example. -test "$GCC" = "yes" && CFLAGS="$CFLAGS -Werror=implicit-function-declaration" test -n "$CFLAGS_END" && CFLAGS="$CFLAGS $CFLAGS_END" # -- Generate files --

1 0

Florian Westphal : configure: make implicit declarations fatal
by fw＠arthur.barton.de 29 Mai '10

29 Mai '10

Module: ngircd.git Branch: master Commit: b3a6c33da0b12ba74dc395979b677813d4bc2c0f URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=b3a6c33d… Author: Florian Westphal <fw(a)strlen.de> Date: Sat May 29 13:06:19 2010 +0200 configure: make implicit declarations fatal from bugzilla #105: "ngircd-16 works great under openbsd4.7/i386, but it segfaults on openbsd4.7/amd64." Caused by missing function prototypes and the resulting truncation of pointer to int. Lets try to catch these bugs during compilation instead of SIGSEGV. --- configure.in | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/configure.in b/configure.in index 6d9312d..8526af6 100644 --- a/configure.in +++ b/configure.in @@ -542,6 +542,7 @@ AC_DEFINE_UNQUOTED(TARGET_OS, "$target_os" ) # Add additional CFLAGS, eventually specified on the command line, but after # running this configure script. Useful for "-Werror" for example. +test "$GCC" = "yes" && CFLAGS="$CFLAGS -Werror=implicit-function-declaration" test -n "$CFLAGS_END" && CFLAGS="$CFLAGS $CFLAGS_END" # -- Generate files --

1 0

Florian Westphal : configure: make implicit declarations fatal
by fw＠arthur.barton.de 29 Mai '10

29 Mai '10

Module: ngircd.git Branch: master Commit: 10657f88819f5caa8c43d68474dff299816b0db1 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=10657f88… Author: Florian Westphal <fw(a)strlen.de> Date: Sat May 29 13:06:19 2010 +0200 configure: make implicit declarations fatal from bugzilla #105: "ngircd-16 works great under openbsd4.7/i386, but it segfaults on openbsd4.7/amd64." Caused by missing function prototypes and the resulting truncation of pointer to int. Lets try to catch these bugs during compilation instead of SIGSEGV. --- configure.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/configure.in b/configure.in index 6d9312d..5e90f09 100644 --- a/configure.in +++ b/configure.in @@ -542,7 +542,7 @@ AC_DEFINE_UNQUOTED(TARGET_OS, "$target_os" ) # Add additional CFLAGS, eventually specified on the command line, but after # running this configure script. Useful for "-Werror" for example. -test -n "$CFLAGS_END" && CFLAGS="$CFLAGS $CFLAGS_END" +CFLAGS="$CFLAGS -Werror=implicit-function-declaration $CFLAGS_END" # -- Generate files --

1 0

Alexander Barton : Don't access already freed memory in IRC_KILL()
by alex＠arthur.barton.de 22 Mai '10

22 Mai '10

Module: ngircd.git Branch: master Commit: 55190f2d3ddf9b4bd43b0555df784c95eed82390 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=55190f2d… Author: Alexander Barton <alex(a)barton.de> Date: Sat May 22 17:03:54 2010 +0200 Don't access already freed memory in IRC_KILL() It is not possible to call Conn_Close() after Client_Destroy() has been called, because Conn_Close wants to access the CLIENT structure which then has been freed already. Fix IRC_KILL to use Conn_Close() for local clients and Client_Destroy() for remote clients only (and never both). --- src/ngircd/irc.c | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/ngircd/irc.c b/src/ngircd/irc.c index b4db3b7..0cb9a6e 100644 --- a/src/ngircd/irc.c +++ b/src/ngircd/irc.c @@ -160,11 +160,15 @@ IRC_KILL( CLIENT *Client, REQUEST *Req ) Client_Type( c ), Req->argv[0] ); } - /* Kill client NOW! */ + /* Kill the client NOW: + * - Close the local connection (if there is one), + * - Destroy the CLIENT structure for remote clients. + * Note: Conn_Close() removes the CLIENT structure as well. */ conn = Client_Conn( c ); - Client_Destroy( c, NULL, reason, false ); - if( conn > NONE ) - Conn_Close( conn, NULL, reason, true ); + if(conn > NONE) + Conn_Close(conn, NULL, reason, true); + else + Client_Destroy(c, NULL, reason, false); } else Log( LOG_NOTICE, "Client with nick \"%s\" is unknown here.", Req->argv[0] );

1 0

Florian Westphal : fix "beeing" typo
by fw＠arthur.barton.de 14 Mai '10

14 Mai '10

Module: ngircd.git Branch: master Commit: 6dc80bd195ad0760bb560177d6f91c86b7698758 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=6dc80bd1… Author: Florian Westphal <fw(a)strlen.de> Date: Fri May 14 19:43:08 2010 +0200 fix "beeing" typo reported by Fabio Scotoni via bugzilla #101. --- src/ngircd/irc-login.c | 2 +- src/ngircd/irc.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ngircd/irc-login.c b/src/ngircd/irc-login.c index 2de4bd5..c8b44db 100644 --- a/src/ngircd/irc-login.c +++ b/src/ngircd/irc-login.c @@ -356,7 +356,7 @@ IRC_NICK( CLIENT *Client, REQUEST *Req ) * RFC 1459: announce the new client only after receiving the * USER command, first we need more information! */ if (Req->argc < 7) { - LogDebug("Client \"%s\" is beeing registered (RFC 1459) ...", + LogDebug("Client \"%s\" is being registered (RFC 1459) ...", Client_Mask(c)); Client_SetType(c, CLIENT_GOTNICK); } else diff --git a/src/ngircd/irc.c b/src/ngircd/irc.c index 67ad2a6..b4db3b7 100644 --- a/src/ngircd/irc.c +++ b/src/ngircd/irc.c @@ -70,7 +70,7 @@ IRC_ERROR( CLIENT *Client, REQUEST *Req ) * disconnect clients. It can be used by IRC operators and servers, for example * to "solve" nick collisions after netsplits. * Please note that this function is also called internally, without a real - * KILL command beeing received over the network! Client is Client_ThisServer() + * KILL command being received over the network! Client is Client_ThisServer() * in this case. */ GLOBAL bool IRC_KILL( CLIENT *Client, REQUEST *Req )

1 0

Florian Westphal : SSL/TLS: fix bogus 'socket closed' error message
by fw＠arthur.barton.de 07 Mai '10

07 Mai '10

Module: ngircd.git Branch: master Commit: df359835d1f8679b5d8a07c83bffe78008e85834 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=df359835… Author: Florian Westphal <fw(a)strlen.de> Date: Fri May 7 23:25:59 2010 +0200 SSL/TLS: fix bogus 'socket closed' error message When we get there then the ssl handshake has failed, or we could not create a ssl context because ssl library initialization failed on startup. Reflect that in the log message. --- src/ngircd/conn-ssl.c | 5 +++-- src/ngircd/conn.c | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/ngircd/conn-ssl.c b/src/ngircd/conn-ssl.c index ae1646c..6a0404f 100644 --- a/src/ngircd/conn-ssl.c +++ b/src/ngircd/conn-ssl.c @@ -383,9 +383,10 @@ ConnSSL_Init_SSL(CONNECTION *c) int ret; assert(c != NULL); #ifdef HAVE_LIBSSL - if (!ssl_ctx) /* NULL when library initialization failed */ + if (!ssl_ctx) { + Log(LOG_ERR, "Cannot init ssl_ctx: OpenSSL initialization failed at startup"); return false; - + } assert(c->ssl_state.ssl == NULL); c->ssl_state.ssl = SSL_new(ssl_ctx); diff --git a/src/ngircd/conn.c b/src/ngircd/conn.c index 4367754..6994c8b 100644 --- a/src/ngircd/conn.c +++ b/src/ngircd/conn.c @@ -342,7 +342,7 @@ cb_clientserver_ssl(int sock, short what) case 0: return; /* EAGAIN: callback will be invoked again by IO layer */ default: - Conn_Close(idx, "Socket closed!", "SSL accept error", false); + Conn_Close(idx, "SSL accept error, closing socket", "SSL accept error", false); return; } if (what & IO_WANTREAD)

1 0

Tag rel-16: Alexander Barton : ngIRCd release 16
by alex＠arthur.barton.de 02 Mai '10

02 Mai '10

Module: ngircd.git Branch: refs/tags/rel-16 Tag: 6927f1b9a225a2932a63149d68c3ec745eba9b6b URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=tag;h=6927f1b9a22… Tagger: Alexander Barton <alex(a)barton.de> Date: Sun May 2 15:25:45 2010 +0200 ngIRCd release 16

1 0

Alexander Barton : ngIRCd release 16
by alex＠arthur.barton.de 02 Mai '10

02 Mai '10

Module: ngircd.git Branch: master Commit: defd7e09afb62ac71859ad910e6dd52a86fb0ae2 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=defd7e09… Author: Alexander Barton <alex(a)barton.de> Date: Sun May 2 15:25:35 2010 +0200 ngIRCd release 16 --- ChangeLog | 4 +++- NEWS | 2 +- configure.in | 2 +- contrib/Debian/changelog | 6 ++++++ contrib/ngircd.spec | 2 +- 5 files changed, 12 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 55b0c39..d40a2be 100644 --- a/ChangeLog +++ b/ChangeLog @@ -10,7 +10,9 @@ -- ChangeLog -- -ngIRCd Release 16 +ngIRCd Release 16 (2010-05-02) + + - doc/SSL: remove line continuation marker ngIRCd 16~rc2 (2010-04-25) - Updated some more copyright notices, it's 2010 already :-) diff --git a/NEWS b/NEWS index 71f9f60..3d81baf 100644 --- a/NEWS +++ b/NEWS @@ -10,7 +10,7 @@ -- NEWS -- -ngIRCd Release 16 +ngIRCd Release 16 (2010-05-02) ngIRCd 16~rc2 (2010-04-25) - Enhace connection statistics counters: display total number of served diff --git a/configure.in b/configure.in index 112bad3..6d9312d 100644 --- a/configure.in +++ b/configure.in @@ -12,7 +12,7 @@ # -- Initialisation -- AC_PREREQ(2.50) -AC_INIT(ngircd, 16~rc2) +AC_INIT(ngircd, 16) AC_CONFIG_SRCDIR(src/ngircd/ngircd.c) AC_CANONICAL_TARGET AM_INIT_AUTOMAKE(1.6) diff --git a/contrib/Debian/changelog b/contrib/Debian/changelog index 9da2f18..a337686 100644 --- a/contrib/Debian/changelog +++ b/contrib/Debian/changelog @@ -1,3 +1,9 @@ +ngircd (16-0ab1) unstable; urgency=low + + * New "upstream" release: ngIRCd 16. + + -- Alexander Barton <alex(a)barton.de> Sun, 02 May 2010 13:32:41 +0200 + ngircd (16~rc2-0ab1) unstable; urgency=low * New "upstream" release candidate 2 for ngIRCd Release 16. diff --git a/contrib/ngircd.spec b/contrib/ngircd.spec index b957517..4ecc152 100644 --- a/contrib/ngircd.spec +++ b/contrib/ngircd.spec @@ -1,5 +1,5 @@ %define name ngircd -%define version 16~rc2 +%define version 16 %define release 1 %define prefix %{_prefix}

1 0

Florian Westphal : doc/SSL: remove line continuation marker
by fw＠arthur.barton.de 01 Mai '10

01 Mai '10

Module: ngircd.git Branch: master Commit: 29d448ed637968359394b1189f3f2be8076f1134 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=29d448ed… Author: Florian Westphal <fw(a)strlen.de> Date: Sat May 1 20:29:14 2010 +0200 doc/SSL: remove line continuation marker some people got confused by the '\' line continuation marker, thus put everything in a single line, even if the line gets overly long. --- doc/SSL.txt | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/doc/SSL.txt b/doc/SSL.txt index 7207f1b..394894a 100644 --- a/doc/SSL.txt +++ b/doc/SSL.txt @@ -49,8 +49,7 @@ Creating a self-signed certificate OpenSSL: Creating a self-signed certificate and key: - $ openssl req -newkey rsa:2048 -x509 -keyout server-key.pem \ - -out server-cert.pem -days 1461 + $ openssl req -newkey rsa:2048 -x509 -keyout server-key.pem -out server-cert.pem -days 1461 Create DH parameters (optional): $ openssl dhparam -2 -out dhparams.pem 2048 @@ -58,8 +57,7 @@ GnuTLS: Creating a self-signed certificate and key: $ certtool --generate-privkey --bits 2048 --outfile server-key.pem - $ certtool --generate-self-signed --load-privkey server-key.pem \ - --outfile server-cert.pem + $ certtool --generate-self-signed --load-privkey server-key.pem --outfile server-cert.pem Create DH parameters (optional): $ certtool --generate-dh-params --bits 2048 --outfile dhparams.pem

1 0