X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?p=ngircd-alex.git;a=blobdiff_plain;f=src%2Fngircd%2Fconf.c;h=9d6071e1e5c165c90a535b42450329a754e0dab3;hp=4cc78fe20bb99a1d373cde763cddc685db015891;hb=0b91df05e0b85980292956973b339ecce31e28ed;hpb=02a22611be07e39b8267a27ae0f391aa1f81ede9;ds=sidebyside

diff --git a/src/ngircd/conf.c b/src/ngircd/conf.c
index 4cc78fe2..9d6071e1 100644
--- 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.54 2003/03/27 01:21:38 alex Exp $";
+static char UNUSED id[] = "$Id: conf.c,v 1.56 2003/04/20 23:09:43 alex Exp $";
 
 #include "imp.h"
 #include <assert.h>
@@ -329,7 +329,7 @@ Set_Defaults( BOOLEAN InitServers )
 	INT i;
 
 	strcpy( Conf_ServerName, "" );
-	sprintf( Conf_ServerInfo, "%s %s", PACKAGE, VERSION );
+	sprintf( Conf_ServerInfo, "%s %s", PACKAGE_NAME, PACKAGE_VERSION );
 	strcpy( Conf_ServerPwd, "" );
 
 	strcpy( Conf_ServerAdmin1, "" );
@@ -376,7 +376,7 @@ Read_Config( VOID )
 	{
 		/* No configuration file found! */
 		Config_Error( LOG_ALERT, "Can't read configuration \"%s\": %s", NGIRCd_ConfFile, strerror( errno ));
-		Config_Error( LOG_ALERT, "%s exiting due to fatal errors!", PACKAGE );
+		Config_Error( LOG_ALERT, "%s exiting due to fatal errors!", PACKAGE_NAME );
 		exit( 1 );
 	}
 
@@ -412,7 +412,7 @@ Read_Config( VOID )
 			{
 				/* Mark server as "once" */
 				Conf_Server[i].flags |= CONF_SFLAG_ONCE;
-				Log( LOG_DEBUG, "Market server %d as \"once\"", i );
+				Log( LOG_DEBUG, "Marked server %d as \"once\"", i );
 			}
 		}
 	}
@@ -833,7 +833,7 @@ Validate_Config( BOOLEAN Configtest )
 		Config_Error( LOG_ALERT, "No server name configured in \"%s\" ('ServerName')!", NGIRCd_ConfFile );
 		if( ! Configtest )
 		{
-			Config_Error( LOG_ALERT, "%s exiting due to fatal errors!", PACKAGE );
+			Config_Error( LOG_ALERT, "%s exiting due to fatal errors!", PACKAGE_NAME );
 			exit( 1 );
 		}
 	}
@@ -845,7 +845,7 @@ Validate_Config( BOOLEAN Configtest )
 		Config_Error( LOG_ALERT, "No administrator email address configured in \"%s\" ('AdminEMail')!", NGIRCd_ConfFile );
 		if( ! Configtest )
 		{
-			Config_Error( LOG_ALERT, "%s exiting due to fatal errors!", PACKAGE );
+			Config_Error( LOG_ALERT, "%s exiting due to fatal errors!", PACKAGE_NAME );
 			exit( 1 );
 		}
 	}