Version 0.7.0

ChangeLog

@@ -10,7 +10,9 @@
                                -- ChangeLog --
 
 
-ngIRCd 0.7.0
+ngIRCd 0.7.0 (2003-05-01)
+  - "ServerName" is checked better now: a dot (".") is required.
+  - The KILL comand verifies and logs more parameters.
 
   ngIRCd 0.7.0-pre2 (2003-04-27)
   - CVS build system fixes (made autogen.sh more portable).
@@ -445,4 +447,4 @@ ngIRCd 0.0.1, 31.12.2001
 
 
 -- 
-$Id: ChangeLog,v 1.188.2.10 2003/04/27 18:33:26 alex Exp $
+$Id: ChangeLog,v 1.188.2.13 2003/05/01 10:15:02 alex Exp $

configure.in

@@ -8,13 +8,13 @@
 # (at your option) any later version.
 # Please read the file COPYING, README and AUTHORS for more information.
 #
-# $Id: configure.in,v 1.89.2.5 2003/04/27 18:33:26 alex Exp $
+# $Id: configure.in,v 1.89.2.6 2003/05/01 10:15:02 alex Exp $
 #
 
 # -- Initialisierung --
 
 AC_PREREQ(2.50)
-AC_INIT(ngircd, 0.7.0-pre2)
+AC_INIT(ngircd, 0.7.0)
 AC_CONFIG_SRCDIR(src/ngircd/ngircd.c)
 AC_CANONICAL_TARGET
 AM_INIT_AUTOMAKE(1.6)

contrib/ngircd.spec

@@ -1,5 +1,5 @@
 %define name    ngircd
-%define version 0.7.0-pre2
+%define version 0.7.0
 %define release 1
 %define prefix  %{_prefix}
 

doc/FAQ.txt

@@ -19,6 +19,10 @@ A: Yes. ngIRCd is compatible to the original ircd used by IRCNet. Actually
 Q: Is there a homepage with further information and downloads?
 A: Yes. Please visit <http://arthur.ath.cx/~alex/ngircd/>.
 
+Q: Why should I use ngIRCd instead of the original one?
+A: ngIRCd offers several benefits: no problems with dynamic IPs, easy to
+   configure, open source (GPL), under active development.
+
 
 II. Compilation
 ~~~~~~~~~~~~~~~
@@ -60,4 +64,4 @@ A: Please file a bug report at <http://arthur.ath.cx/bugzilla/ngircd/>!
 
 
 -- 
-$Id: FAQ.txt,v 1.5 2003/04/05 11:37:17 alex Exp $
+$Id: FAQ.txt,v 1.5.2.1 2003/04/29 13:45:09 alex Exp $

doc/Platforms.txt

@@ -26,6 +26,7 @@ list can be updated. Thanks for your help!
                                                                     | | | |
 Platform                    Compiler     ngIRCd     Date     Tester C M T R See
 --------------------------- ------------ ---------- -------- ------ - - - - ---
+i386/pc/solaris2.9          gcc 3.2.2    0.7.x-CVS  03-04-28 alex   Y Y Y Y
 i386/unknown/freebsd5.0     gcc 3.2.1    0.7.x-CVS  03-04-23 alex   Y Y Y Y
 i386/unknown/netbsdelf1.6.1 gcc 2.95.3   0.7.x-CVS  03-04-23 alex   Y Y Y Y
 i686/pc/cygwin              gcc 3.2      0.7.x-CVS  03-04-24 alex   Y Y n Y
@@ -49,4 +50,4 @@ Notes
 			
 
 -- 
-$Id: Platforms.txt,v 1.1.2.3 2003/04/23 23:32:24 alex Exp $
+$Id: Platforms.txt,v 1.1.2.4 2003/04/28 00:14:04 alex Exp $

doc/Protocol.txt

@@ -22,7 +22,7 @@ in all details. But because the ngIRCd should be a fully compatible
 replacement for this server ("ircd") it tries to emulate these differences.
 
 If you don't like this behavior please ./configure the ngIRCd using the
-"--enable-strict-rfc" command line option. But please not: not all IRC
+"--enable-strict-rfc" command line option. But please note: not all IRC
 clients are compatible with such an server, some can't even connect at all!
 Therefore this option isn't desired for "normal operation".
 
@@ -104,4 +104,4 @@ channel mode). In this case <limit> should be "0".
 
 
 -- 
-$Id: Protocol.txt,v 1.9 2003/04/21 12:48:40 alex Exp $
+$Id: Protocol.txt,v 1.9.2.1 2003/04/29 13:42:24 alex Exp $

doc/sample-ngircd.conf

@@ -1,4 +1,4 @@
-# $Id: sample-ngircd.conf,v 1.20.2.1 2003/04/27 11:50:32 alex Exp $
+# $Id: sample-ngircd.conf,v 1.20.2.2 2003/04/29 12:37:17 alex Exp $
 
 #
 # This is a sample configuration file for the ngIRCd, which must adept to
@@ -16,7 +16,8 @@
 	# configuration of the server, like the server name and the ports
 	# on which the server should be listening.
 	
-	# Server name in the IRC-network
+	# Server name in the IRC network, must contain at least one dot
+	# (".") and be unique in the IRC network.
 	Name = irc.the.net
 	
 	# Info text of the server. This will be shown by WHOIS and

src/ngircd/conf.c

@@ -14,7 +14,7 @@
 
 #include "portab.h"
 
-static char UNUSED id[] = "$Id: conf.c,v 1.57.2.1 2003/04/27 11:48:53 alex Exp $";
+static char UNUSED id[] = "$Id: conf.c,v 1.57.2.2 2003/04/29 12:37:18 alex Exp $";
 
 #include "imp.h"
 #include <assert.h>
@@ -837,6 +837,17 @@ Validate_Config( BOOLEAN Configtest )
 			exit( 1 );
 		}
 	}
+	
+	if( ! strchr( Conf_ServerName, '.' ))
+	{
+		/* No dot in server name! */
+		Config_Error( LOG_ALERT, "Invalid server name configured in \"%s\" ('ServerName'): Dot missing!", NGIRCd_ConfFile );
+		if( ! Configtest )
+		{
+			Config_Error( LOG_ALERT, "%s exiting due to fatal errors!", PACKAGE_NAME );
+			exit( 1 );
+		}
+	}
 
 #ifdef STRICT_RFC
 	if( ! Conf_ServerAdminMail[0] )

src/ngircd/irc.c

@@ -14,7 +14,7 @@
 
 #include "portab.h"
 
-static char UNUSED id[] = "$Id: irc.c,v 1.120 2003/03/31 15:54:21 alex Exp $";
+static char UNUSED id[] = "$Id: irc.c,v 1.120.2.1 2003/04/29 12:20:14 alex Exp $";
 
 #include "imp.h"
 #include <assert.h>
@@ -95,8 +95,30 @@ IRC_KILL( CLIENT *Client, REQUEST *Req )
 	if( c )
 	{
 		/* Yes, there is such a client -- but is it a valid user? */
-		if( Client_Type( c ) == CLIENT_SERVER ) IRC_WriteStrClient( Client, ERR_CANTKILLSERVER_MSG, Client_ID( Client ));
-		else if( Client_Type( c ) != CLIENT_USER  )IRC_WriteStrClient( Client, ERR_NOPRIVILEGES_MSG, Client_ID( Client ));
+		if( Client_Type( c ) == CLIENT_SERVER )
+		{
+			if( Client != Client_ThisServer( )) IRC_WriteStrClient( Client, ERR_CANTKILLSERVER_MSG, Client_ID( Client ));
+			else
+			{
+				/* Oops, I should kill another server!? */
+				Log( LOG_ERR, "Can't KILL server \"%s\"!", Req->argv[0] );
+				conn = Client_Conn( Client_NextHop( c ));
+				assert( conn > NONE );
+				Conn_Close( conn, NULL, "Nick collision for server!?", TRUE );
+			}
+		}
+		else if( Client_Type( c ) != CLIENT_USER  )
+		{
+			if( Client != Client_ThisServer( )) IRC_WriteStrClient( Client, ERR_NOPRIVILEGES_MSG, Client_ID( Client ));
+			else
+			{
+				/* Oops, what sould I close?? */
+				Log( LOG_ERR, "Can't KILL \"%s\": invalid client type!", Req->argv[0] );
+				conn = Client_Conn( Client_NextHop( c ));
+				assert( conn > NONE );
+				Conn_Close( conn, NULL, "Collision for invalid client type!?", TRUE );
+			}
+		}
 		else
 		{
 			/* Kill user NOW! */