repo: ngircd
action: commit
revision: 
path_from: 
revision_from: 05170bc94cc3c200da0b973b3cf1a44635e64611:
path_to: 
revision_to: 

commit 05170bc94cc3c200da0b973b3cf1a44635e64611
Author: Alexander Barton 
Date:   Fri Dec 19 14:32:59 2003 +0000

    Fixed error messages related to server name configuration; updated
    sample configuration file. (from 0.7.x)

diff --git a/doc/sample-ngircd.conf b/doc/sample-ngircd.conf

--- a/doc/sample-ngircd.conf
+++ b/doc/sample-ngircd.conf
@@ -1,13 +1,13 @@
-# $Id: sample-ngircd.conf,v 1.24 2003/11/05 21:41:02 alex Exp $
+# $Id: sample-ngircd.conf,v 1.25 2003/12/19 14:32:59 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, 
-# Initial translation by Ilja Osthoff, 
+# 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
diff --git a/src/ngircd/conf.c b/src/ngircd/conf.c

--- a/src/ngircd/conf.c
+++ b/src/ngircd/conf.c
@@ -14,7 +14,7 @@

 #include "portab.h"

-static char UNUSED id[] = "$Id: conf.c,v 1.61 2003/11/05 21:41:02 alex Exp $";
+static char UNUSED id[] = "$Id: conf.c,v 1.62 2003/12/19 14:32:59 alex Exp $";

 #include "imp.h"
 #include 
@@ -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 );

-----END OF PAGE-----