commit d917f06af830d1e0ab2f48be08498402e5e7c22b
from: Alexander Barton <alex@barton.de>
date: Fri Dec 19 14:30:49 2003 UTC

Fixed error messages related to server name configuration; updated
sample configuration file.

commit - 715e5532a98452ea7556659d07a735d47d1ff854
commit + d917f06af830d1e0ab2f48be08498402e5e7c22b
blob - c6d263fb67218b01cf40fd166d1d84ae9edc0a2f
blob + b5ed91059c93b51f05535958f2fcedda7c0d2109
--- doc/sample-ngircd.conf
+++ doc/sample-ngircd.conf
@@ -1,13 +1,13 @@
-# $Id: sample-ngircd.conf,v 1.20.2.3 2003/11/07 20:51:09 alex Exp $
+# $Id: sample-ngircd.conf,v 1.20.2.4 2003/12/19 14:30:49 alex Exp $
 
 #
-# This is a sample configuration file for the ngIRCd, which must adept to
-# the local preferences and needs.
+# This is a sample configuration file for the ngIRCd, which must be adepted
+# to the local preferences and needs.
 #
 # Comments are started with "#" or ";".
 #
-# Author: Alexander Barton, <alex@barton.de>
-# Initial translation by Ilja Osthoff, <ilja@glide.ath.cx>
+# Use "ngircd --configtest" (see manual page ngircd(8)) to validate that the
+# server interpreted the configuration file as expected!
 #
 
 [Global]
@@ -17,7 +17,7 @@
 	# on which the server should be listening.
 	
 	# Server name in the IRC network, must contain at least one dot
-	# (".") and be unique in the IRC network.
+	# (".") and be unique in the IRC network. Required!
 	Name = irc.the.net
 	
 	# Info text of the server. This will be shown by WHOIS and
@@ -28,7 +28,7 @@
 	;Password = abc
 	
 	# Information about the server and the administrator, used by the
-	# ADMIN command.
+	# ADMIN command. Not required by server but by RFC!
 	;AdminInfo1 = Description
 	;AdminInfo2 = Location
 	;AdminEMail = admin@irc.server
blob - 2d8a8c59d77d2e73c03582a5ed8f0193f1b64fad
blob + 9fc318a75309a372853296b79813c0ab3e16925f
--- src/ngircd/conf.c
+++ src/ngircd/conf.c
@@ -14,7 +14,7 @@
 
 #include "portab.h"
 
-static char UNUSED id[] = "$Id: conf.c,v 1.57.2.3 2003/11/07 20:51:10 alex Exp $";
+static char UNUSED id[] = "$Id: conf.c,v 1.57.2.4 2003/12/19 14:30:49 alex Exp $";
 
 #include "imp.h"
 #include <assert.h>
@@ -854,7 +854,7 @@ Validate_Config( BOOLEAN Configtest )
 	if( ! Conf_ServerName[0] )
 	{
 		/* No server name configured! */
-		Config_Error( LOG_ALERT, "No server name configured in \"%s\" ('ServerName')!", NGIRCd_ConfFile );
+		Config_Error( LOG_ALERT, "No server name configured in \"%s\" (section 'Global': 'Name')!", NGIRCd_ConfFile );
 		if( ! Configtest )
 		{
 			Config_Error( LOG_ALERT, "%s exiting due to fatal errors!", PACKAGE_NAME );
@@ -862,10 +862,10 @@ Validate_Config( BOOLEAN Configtest )
 		}
 	}
 	
-	if( ! strchr( Conf_ServerName, '.' ))
+	if( Conf_ServerName[0] && ! strchr( Conf_ServerName, '.' ))
 	{
 		/* No dot in server name! */
-		Config_Error( LOG_ALERT, "Invalid server name configured in \"%s\" ('ServerName'): Dot missing!", NGIRCd_ConfFile );
+		Config_Error( LOG_ALERT, "Invalid server name configured in \"%s\" (section 'Global': 'Name'): Dot missing!", NGIRCd_ConfFile );
 		if( ! Configtest )
 		{
 			Config_Error( LOG_ALERT, "%s exiting due to fatal errors!", PACKAGE_NAME );