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
index 0e4439309a9c16c7e9519a471c916d8ba7096df4..f136d27ce4973770dcd6b2c473deb0446412ab16 100644 (file)
--- 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, <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

diff --git a/src/ngircd/conf.c b/src/ngircd/conf.c
index d17168c3348e731c75433478947f91084beb8f3a..81e0a916fe4c5c833dcd0848babbcb9265307661 100644 (file)
--- 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 <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 );