Fixed detection of IRC lines which are too long to send. Detected by

Florian Westphal, <westphal@foo.fh-furtwangen.de>. [from HEAD]

diff --git a/ChangeLog b/ChangeLog
index 0ff6296e0608197b3432ad2285fd5735f04785d6..d53ef7fb6e36b0006b753b3b904f9f5c01bbcf09 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,7 @@
 
                      ngIRCd - Next Generation IRC Server
 
-                      (c)2001-2005 by Alexander Barton,
+                       (c)2001-2005 Alexander Barton,
                     alex@barton.de, http://www.barton.de/
 
                ngIRCd is free software and published under the
@@ -12,6 +12,8 @@
 
 ngircd 0.8.x (CVS)
 
+  - Fixed detection of IRC lines which are too long to send. Detected by
+    Florian Westphal, <westphal@foo.fh-furtwangen.de>.
   - Fixed return values of our own implementation of strlcpy(). The code has
     been taken from rsync and they fixed it, but we didn't until today :-/
     It has only been used when the system didn't implement strlcpy by itself,
@@ -547,4 +549,4 @@ ngIRCd 0.0.1, 31.12.2001
 
 
 -- 
-$Id: ChangeLog,v 1.233.2.12 2005/01/18 09:09:05 alex Exp $
+$Id: ChangeLog,v 1.233.2.13 2005/01/19 23:35:42 alex Exp $

diff --git a/src/ngircd/conn.c b/src/ngircd/conn.c
index 052765c358ffa9f45c0dc3bf7105e400284da433..326292e5b7c3c41cb5912c613610b3e7499db19b 100644 (file)
--- a/src/ngircd/conn.c
+++ b/src/ngircd/conn.c
@@ -16,7 +16,7 @@
 
 #include "portab.h"
 
-static char UNUSED id[] = "$Id: conn.c,v 1.134.2.3 2004/12/25 00:00:42 alex Exp $";
+static char UNUSED id[] = "$Id: conn.c,v 1.134.2.4 2005/01/19 23:35:42 alex Exp $";
 
 #include "imp.h"
 #include <assert.h>
@@ -525,7 +525,7 @@ va_dcl
 #else
        va_start( ap );
 #endif
-       if( vsnprintf( buffer, COMMAND_LEN - 2, Format, ap ) == COMMAND_LEN - 2 )
+       if( vsnprintf( buffer, COMMAND_LEN - 2, Format, ap ) >= COMMAND_LEN - 2 )
        {
                Log( LOG_CRIT, "Text too long to send (connection %d)!", Idx );
                Conn_Close( Idx, "Text too long to send!", NULL, FALSE );