X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?p=ngircd-alex.git;a=blobdiff_plain;f=src%2Fngircd%2Fconf.c;h=62b5044c87be0daa7569846c6d07d42f1bf67417;hp=c947997215773e7e486ba586648ee32349b1aa24;hb=85dc4d87770f821b777f5dbf6372956dbffc770c;hpb=b80e115f3947eae39aba39d1647f0a81f3d95fa3

diff --git a/src/ngircd/conf.c b/src/ngircd/conf.c
index c9479972..62b5044c 100644
--- a/src/ngircd/conf.c
+++ b/src/ngircd/conf.c
@@ -1,6 +1,6 @@
 /*
  * ngIRCd -- The Next Generation IRC Daemon
- * Copyright (c)2001-2011 Alexander Barton (alex@barton.de) and Contributors.
+ * Copyright (c)2001-2014 Alexander Barton (alex@barton.de) and Contributors.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -16,7 +16,6 @@
  * Configuration management (reading, parsing & validation)
  */
 
-#include "imp.h"
 #include <assert.h>
 #include <errno.h>
 #ifdef PROTOTYPES
@@ -28,26 +27,19 @@
 #include <stdlib.h>
 #include <string.h>
 #include <strings.h>
+#include <time.h>
 #include <unistd.h>
 #include <pwd.h>
 #include <grp.h>
 #include <sys/types.h>
-#include <unistd.h>
-
-#ifdef HAVE_CTYPE_H
-# include <ctype.h>
-#endif
+#include <dirent.h>
 
-#include "array.h"
 #include "ngircd.h"
 #include "conn.h"
 #include "channel.h"
-#include "defines.h"
 #include "log.h"
 #include "match.h"
-#include "tool.h"
 
-#include "exp.h"
 #include "conf.h"
 
 
@@ -55,27 +47,36 @@ static bool Use_Log = true, Using_MotdFile = true;
 static CONF_SERVER New_Server;
 static int New_Server_Idx;
 
-static size_t Conf_Oper_Count;
-static size_t Conf_Channel_Count;
 static char Conf_MotdFile[FNAME_LEN];
+static char Conf_HelpFile[FNAME_LEN];
+static char Conf_IncludeDir[FNAME_LEN];
 
 static void Set_Defaults PARAMS(( bool InitServers ));
-static bool Read_Config PARAMS(( bool ngircd_starting ));
+static bool Read_Config PARAMS(( bool TestOnly, bool IsStarting ));
+static void Read_Config_File PARAMS(( const char *File, FILE *fd ));
 static bool Validate_Config PARAMS(( bool TestOnly, bool Rehash ));
 
-static void Handle_GLOBAL PARAMS(( int Line, char *Var, char *Arg ));
-static void Handle_LIMITS PARAMS(( int Line, char *Var, char *Arg ));
-static void Handle_OPTIONS PARAMS(( int Line, char *Var, char *Arg ));
-static void Handle_OPERATOR PARAMS(( int Line, char *Var, char *Arg ));
-static void Handle_SERVER PARAMS(( int Line, char *Var, char *Arg ));
-static void Handle_CHANNEL PARAMS(( int Line, char *Var, char *Arg ));
-
-static void Config_Error PARAMS(( const int Level, const char *Format, ... ));
-
-static void Config_Error_NaN PARAMS(( const int LINE, const char *Value ));
-static void Config_Error_Section PARAMS(( const int Line, const char *Item,
-					  const char *Section ));
-static void Config_Error_TooLong PARAMS(( const int LINE, const char *Value ));
+static void Handle_GLOBAL PARAMS((const char *File, int Line,
+				  char *Var, char *Arg ));
+static void Handle_LIMITS PARAMS((const char *File, int Line,
+				  char *Var, char *Arg ));
+static void Handle_OPTIONS PARAMS((const char *File, int Line,
+				   char *Var, char *Arg ));
+static void Handle_OPERATOR PARAMS((const char *File, int Line,
+				    char *Var, char *Arg ));
+static void Handle_SERVER PARAMS((const char *File, int Line,
+				  char *Var, char *Arg ));
+static void Handle_CHANNEL PARAMS((const char *File, int Line,
+				   char *Var, char *Arg ));
+
+static void Config_Error PARAMS((const int Level, const char *Format, ...));
+
+static void Config_Error_NaN PARAMS((const char *File, const int LINE,
+				     const char *Value));
+static void Config_Error_Section PARAMS((const char *File, const int Line,
+					 const char *Item, const char *Section));
+static void Config_Error_TooLong PARAMS((const char *File, const int LINE,
+					 const char *Value));
 
 static void Init_Server_Struct PARAMS(( CONF_SERVER *Server ));
 
@@ -86,9 +87,17 @@ static void Init_Server_Struct PARAMS(( CONF_SERVER *Server ));
 #define DEFAULT_LISTEN_ADDRSTR "0.0.0.0"
 #endif
 
+#ifdef HAVE_LIBSSL
+#define DEFAULT_CIPHERS		"HIGH:!aNULL:@STRENGTH:!SSLv3"
+#endif
+#ifdef HAVE_LIBGNUTLS
+#define DEFAULT_CIPHERS		"SECURE128:-VERS-SSL3.0"
+#endif
 
 #ifdef SSL_SUPPORT
 
+static void Handle_SSL PARAMS((const char *File, int Line, char *Var, char *Ark));
+
 struct SSLOptions Conf_SSLOptions;
 
 /**
@@ -106,6 +115,33 @@ ConfSSL_Init(void)
 	free(Conf_SSLOptions.DHFile);
 	Conf_SSLOptions.DHFile = NULL;
 	array_free_wipe(&Conf_SSLOptions.KeyFilePassword);
+
+	array_free(&Conf_SSLOptions.ListenPorts);
+
+	free(Conf_SSLOptions.CipherList);
+	Conf_SSLOptions.CipherList = NULL;
+}
+
+/**
+ * Check if the current configuration uses/requires SSL.
+ *
+ * @returns true if SSL is used and should be initialized.
+ */
+GLOBAL bool
+Conf_SSLInUse(void)
+{
+	int i;
+
+	/* SSL listen ports configured? */
+	if (array_bytes(&Conf_SSLOptions.ListenPorts))
+		return true;
+
+	for (i = 0; i < MAX_SERVERS; i++) {
+		if (Conf_Server[i].port > 0
+		    && Conf_Server[i].SSLConnect)
+			return true;
+	}
+	return false;
 }
 
 /**
@@ -121,6 +157,9 @@ CheckFileReadable(const char *Var, const char *Filename)
 {
 	FILE *fp;
 
+	if (!Filename)
+		return;
+
 	fp = fopen(Filename, "r");
 	if (fp)
 		fclose(fp);
@@ -171,7 +210,7 @@ ports_puts(array *a)
  * Parse a comma separated string into an array of port numbers (integers).
  */
 static void
-ports_parse(array *a, int Line, char *Arg)
+ports_parse(array *a, const char *File, int Line, char *Arg)
 {
 	char *ptr;
 	int port;
@@ -187,10 +226,10 @@ ports_parse(array *a, int Line, char *Arg)
 			port16 = (UINT16) port;
 			if (!array_catb(a, (char*)&port16, sizeof port16))
 				Config_Error(LOG_ERR, "%s, line %d Could not add port number %ld: %s",
-							NGIRCd_ConfFile, Line, port, strerror(errno));
+					     File, Line, port, strerror(errno));
 		} else {
 			Config_Error( LOG_ERR, "%s, line %d (section \"Global\"): Illegal port number %ld!",
-									NGIRCd_ConfFile, Line, port );
+				     File, Line, port );
 		}
 
 		ptr = strtok( NULL, "," );
@@ -203,7 +242,7 @@ ports_parse(array *a, int Line, char *Arg)
 GLOBAL void
 Conf_Init( void )
 {
-	Read_Config( true );
+	Read_Config(false, true);
 	Validate_Config(false, false);
 }
 
@@ -215,7 +254,7 @@ Conf_Init( void )
 GLOBAL bool
 Conf_Rehash( void )
 {
-	if (!Read_Config(false))
+	if (!Read_Config(false, false))
 		return false;
 	Validate_Config(false, true);
 
@@ -260,18 +299,18 @@ static void
 opers_puts(void)
 {
 	struct Conf_Oper *op;
-	size_t len;
+	size_t count, i;
 
-	len = array_length(&Conf_Opers, sizeof(*op));
+	count = array_length(&Conf_Opers, sizeof(*op));
 	op = array_start(&Conf_Opers);
-	while (len--) {
-		assert(op->name[0]);
+	for (i = 0; i < count; i++, op++) {
+		if (!op->name[0])
+			continue;
 
 		puts("[OPERATOR]");
 		printf("  Name = %s\n", op->name);
 		printf("  Password = %s\n", op->pwd);
 		printf("  Mask = %s\n\n", op->mask ? op->mask : "");
-		op++;
 	}
 }
 
@@ -281,7 +320,7 @@ opers_puts(void)
  * This function waits for a keypress of the user when stdin/stdout are valid
  * tty's ("you can read our nice message and we can read in your keypress").
  *
- * @return	0 on succes, 1 on failure(s); therefore the result code can
+ * @return	0 on success, 1 on failure(s); therefore the result code can
  * 		directly be used by exit() when running "ngircd --configtest".
  */
 GLOBAL int
@@ -296,7 +335,7 @@ Conf_Test( void )
 
 	Use_Log = false;
 
-	if (! Read_Config(true))
+	if (!Read_Config(true, true))
 		return 1;
 
 	config_valid = Validate_Config(true, false);
@@ -313,6 +352,7 @@ Conf_Test( void )
 	printf("  AdminInfo1 = %s\n", Conf_ServerAdmin1);
 	printf("  AdminInfo2 = %s\n", Conf_ServerAdmin2);
 	printf("  AdminEMail = %s\n", Conf_ServerAdminMail);
+	printf("  HelpFile = %s\n", Conf_HelpFile);
 	printf("  Info = %s\n", Conf_ServerInfo);
 	printf("  Listen = %s\n", Conf_ListenAddress);
 	if (Using_MotdFile) {
@@ -323,9 +363,9 @@ Conf_Test( void )
 		printf("  MotdPhrase = %s\n", array_bytes(&Conf_Motd)
 		       ? (const char*) array_start(&Conf_Motd) : "");
 	}
-#ifndef PAM
-	printf("  Password = %s\n", Conf_ServerPwd);
-#endif
+	printf("  Network = %s\n", Conf_Network);
+	if (!Conf_PAM) 
+		printf("  Password = %s\n", Conf_ServerPwd);
 	printf("  PidFile = %s\n", Conf_PidFile);
 	printf("  Ports = ");
 	ports_puts(&Conf_ListenPorts);
@@ -343,50 +383,47 @@ Conf_Test( void )
 
 	puts("[LIMITS]");
 	printf("  ConnectRetry = %d\n", Conf_ConnectRetry);
-	printf("  MaxConnections = %ld\n", Conf_MaxConnections);
+	printf("  IdleTimeout = %d\n", Conf_IdleTimeout);
+	printf("  MaxConnections = %d\n", Conf_MaxConnections);
 	printf("  MaxConnectionsIP = %d\n", Conf_MaxConnectionsIP);
 	printf("  MaxJoins = %d\n", Conf_MaxJoins > 0 ? Conf_MaxJoins : -1);
 	printf("  MaxNickLength = %u\n", Conf_MaxNickLength - 1);
+	printf("  MaxListSize = %d\n", Conf_MaxListSize);
 	printf("  PingTimeout = %d\n", Conf_PingTimeout);
 	printf("  PongTimeout = %d\n", Conf_PongTimeout);
 	puts("");
 
 	puts("[OPTIONS]");
+	printf("  AllowedChannelTypes = %s\n", Conf_AllowedChannelTypes);
 	printf("  AllowRemoteOper = %s\n", yesno_to_str(Conf_AllowRemoteOper));
 	printf("  ChrootDir = %s\n", Conf_Chroot);
 	printf("  CloakHost = %s\n", Conf_CloakHost);
+	printf("  CloakHostModeX = %s\n", Conf_CloakHostModeX);
+	printf("  CloakHostSalt = %s\n", Conf_CloakHostSalt);
 	printf("  CloakUserToNick = %s\n", yesno_to_str(Conf_CloakUserToNick));
 #ifdef WANT_IPV6
 	printf("  ConnectIPv4 = %s\n", yesno_to_str(Conf_ConnectIPv6));
 	printf("  ConnectIPv6 = %s\n", yesno_to_str(Conf_ConnectIPv4));
 #endif
+	printf("  DefaultUserModes = %s\n", Conf_DefaultUserModes);
 	printf("  DNS = %s\n", yesno_to_str(Conf_DNS));
 #ifdef IDENT
 	printf("  Ident = %s\n", yesno_to_str(Conf_Ident));
 #endif
+	printf("  IncludeDir = %s\n", Conf_IncludeDir);
 	printf("  MorePrivacy = %s\n", yesno_to_str(Conf_MorePrivacy));
-	printf("  NoticeAuth = %s\n", yesno_to_str(Conf_NoticeAuth));
+	printf("  NoticeBeforeRegistration = %s\n", yesno_to_str(Conf_NoticeBeforeRegistration));
 	printf("  OperCanUseMode = %s\n", yesno_to_str(Conf_OperCanMode));
+	printf("  OperChanPAutoOp = %s\n", yesno_to_str(Conf_OperChanPAutoOp));
 	printf("  OperServerMode = %s\n", yesno_to_str(Conf_OperServerMode));
 #ifdef PAM
 	printf("  PAM = %s\n", yesno_to_str(Conf_PAM));
+	printf("  PAMIsOptional = %s\n", yesno_to_str(Conf_PAMIsOptional));
 #endif
-	printf("  PredefChannelsOnly = %s\n", yesno_to_str(Conf_PredefChannelsOnly));
 #ifndef STRICT_RFC
 	printf("  RequireAuthPing = %s\n", yesno_to_str(Conf_AuthPing));
 #endif
-#ifdef SSL_SUPPORT
-	printf("  SSLCertFile = %s\n", Conf_SSLOptions.CertFile);
-	printf("  SSLDHFile = %s\n", Conf_SSLOptions.DHFile);
-	printf("  SSLKeyFile = %s\n", Conf_SSLOptions.KeyFile);
-	if (array_bytes(&Conf_SSLOptions.KeyFilePassword))
-		puts("  SSLKeyFilePassword = <secret>");
-	else
-		puts("  SSLKeyFilePassword = ");
-	array_free_wipe(&Conf_SSLOptions.KeyFilePassword);
-	printf("  SSLPorts = ");
-	ports_puts(&Conf_SSLOptions.ListenPorts);
-#endif
+	printf("  ScrubCTCP = %s\n", yesno_to_str(Conf_ScrubCTCP));
 #ifdef SYSLOG
 	printf("  SyslogFacility = %s\n",
 	       ngt_SyslogFacilityName(Conf_SyslogFacility));
@@ -394,6 +431,26 @@ Conf_Test( void )
 	printf("  WebircPassword = %s\n", Conf_WebircPwd);
 	puts("");
 
+#ifdef SSL_SUPPORT
+	puts("[SSL]");
+	printf("  CertFile = %s\n", Conf_SSLOptions.CertFile
+					? Conf_SSLOptions.CertFile : "");
+	printf("  CipherList = %s\n", Conf_SSLOptions.CipherList ?
+	       Conf_SSLOptions.CipherList : DEFAULT_CIPHERS);
+	printf("  DHFile = %s\n", Conf_SSLOptions.DHFile
+					? Conf_SSLOptions.DHFile : "");
+	printf("  KeyFile = %s\n", Conf_SSLOptions.KeyFile
+					? Conf_SSLOptions.KeyFile : "");
+	if (array_bytes(&Conf_SSLOptions.KeyFilePassword))
+		puts("  KeyFilePassword = <secret>");
+	else
+		puts("  KeyFilePassword = ");
+	array_free_wipe(&Conf_SSLOptions.KeyFilePassword);
+	printf("  Ports = ");
+	ports_puts(&Conf_SSLOptions.ListenPorts);
+	puts("");
+#endif
+
 	opers_puts();
 
 	for( i = 0; i < MAX_SERVERS; i++ ) {
@@ -466,8 +523,16 @@ Conf_UnsetServer( CONN_ID Idx )
 				 * require the next attempt to be delayed. */
 				Conf_Server[i].lasttry =
 					t - Conf_ConnectRetry + RECONNECT_DELAY;
-			} else
-				Conf_Server[i].lasttry = t;
+			} else {
+				/* "Short" connection, enforce "ConnectRetry"
+				 * but randomize it a little bit: 15 seconds. */
+				Conf_Server[i].lasttry =
+#ifdef HAVE_ARC4RANDOM
+					t + (arc4random() % 15);
+#else
+					t + rand() / (RAND_MAX / 15);
+#endif
+			}
 		}
 	}
 }
@@ -475,13 +540,23 @@ Conf_UnsetServer( CONN_ID Idx )
 /**
  * Set connection information for specified configured server.
  */
-GLOBAL void
+GLOBAL bool
 Conf_SetServer( int ConfServer, CONN_ID Idx )
 {
 	assert( ConfServer > NONE );
 	assert( Idx > NONE );
 
+	if (Conf_Server[ConfServer].conn_id > NONE &&
+	    Conf_Server[ConfServer].conn_id != Idx) {
+		Log(LOG_ERR,
+		    "Connection %d: Server configuration of \"%s\" already in use by connection %d!",
+		    Idx, Conf_Server[ConfServer].name,
+		    Conf_Server[ConfServer].conn_id);
+		Conn_Close(Idx, NULL, "Server configuration already in use", true);
+		return false;
+	}
 	Conf_Server[ConfServer].conn_id = Idx;
+	return true;
 }
 
 /**
@@ -543,6 +618,7 @@ Conf_EnablePassiveServer(const char *Name)
 		    && (Conf_Server[i].port > 0)) {
 			/* BINGO! Enable server */
 			Conf_Server[i].flags &= ~CONF_SFLAG_DISABLED;
+			Conf_Server[i].lasttry = 0;
 			return true;
 		}
 	}
@@ -615,14 +691,41 @@ Conf_AddServer(const char *Name, UINT16 Port, const char *Host,
 }
 
 /**
- * Check if the given nick name is an service.
+ * Check if the given nickname is reserved for services on a particular server.
  *
- * @returns true if the given nick name belongs to an "IRC service".
+ * @param ConfServer The server index to check.
+ * @param Nick The nickname to check.
+ * @returns true if the given nickname belongs to an "IRC service".
  */
 GLOBAL bool
-Conf_IsService(int ConfServer, const char *Nick)
+Conf_NickIsService(int ConfServer, const char *Nick)
 {
-	return MatchCaseInsensitive(Conf_Server[ConfServer].svs_mask, Nick);
+	assert (ConfServer >= 0);
+	assert (ConfServer < MAX_SERVERS);
+
+	return MatchCaseInsensitiveList(Conf_Server[ConfServer].svs_mask,
+					Nick, ",");
+}
+
+/**
+ * Check if the given nickname is blocked for "normal client" use.
+ *
+ * @param ConfServer The server index or NONE to check all configured servers.
+ * @param Nick The nickname to check.
+ * @returns true if the given nickname belongs to an "IRC service".
+ */
+GLOBAL bool
+Conf_NickIsBlocked(const char *Nick)
+{
+	int i;
+
+	for(i = 0; i < MAX_SERVERS; i++) {
+		if (!Conf_Server[i].name[0])
+			continue;
+		if (Conf_NickIsService(i, Nick))
+			return true;
+	}
+	return false;
 }
 
 /**
@@ -632,6 +735,7 @@ static void
 Set_Defaults(bool InitServers)
 {
 	int i;
+	char random[RANDOM_SALT_LEN + 1];
 
 	/* Global */
 	strcpy(Conf_ServerName, "");
@@ -640,31 +744,43 @@ Set_Defaults(bool InitServers)
 	strcpy(Conf_ServerAdminMail, "");
 	snprintf(Conf_ServerInfo, sizeof Conf_ServerInfo, "%s %s",
 		 PACKAGE_NAME, PACKAGE_VERSION);
+	strcpy(Conf_Network, "");
 	free(Conf_ListenAddress);
 	Conf_ListenAddress = NULL;
+	array_free(&Conf_ListenPorts);
 	array_free(&Conf_Motd);
+	array_free(&Conf_Helptext);
 	strlcpy(Conf_MotdFile, SYSCONFDIR, sizeof(Conf_MotdFile));
 	strlcat(Conf_MotdFile, MOTD_FILE, sizeof(Conf_MotdFile));
+	strlcpy(Conf_HelpFile, DOCDIR, sizeof(Conf_HelpFile));
+	strlcat(Conf_HelpFile, HELP_FILE, sizeof(Conf_HelpFile));
 	strcpy(Conf_ServerPwd, "");
 	strlcpy(Conf_PidFile, PID_FILE, sizeof(Conf_PidFile));
 	Conf_UID = Conf_GID = 0;
 
 	/* Limits */
 	Conf_ConnectRetry = 60;
+	Conf_IdleTimeout = 0;
 	Conf_MaxConnections = 0;
 	Conf_MaxConnectionsIP = 5;
 	Conf_MaxJoins = 10;
 	Conf_MaxNickLength = CLIENT_NICK_LEN_DEFAULT;
+	Conf_MaxListSize = 100;
 	Conf_PingTimeout = 120;
 	Conf_PongTimeout = 20;
 
 	/* Options */
+	strlcpy(Conf_AllowedChannelTypes, CHANTYPES,
+		sizeof(Conf_AllowedChannelTypes));
 	Conf_AllowRemoteOper = false;
 #ifndef STRICT_RFC
 	Conf_AuthPing = false;
 #endif
 	strlcpy(Conf_Chroot, CHROOT_DIR, sizeof(Conf_Chroot));
 	strcpy(Conf_CloakHost, "");
+	strcpy(Conf_CloakHostModeX, "");
+	strlcpy(Conf_CloakHostSalt, ngt_RandomStr(random, RANDOM_SALT_LEN),
+		sizeof(Conf_CloakHostSalt));
 	Conf_CloakUserToNick = false;
 	Conf_ConnectIPv4 = true;
 #ifdef WANT_IPV6
@@ -672,22 +788,26 @@ Set_Defaults(bool InitServers)
 #else
 	Conf_ConnectIPv6 = false;
 #endif
+	strcpy(Conf_DefaultUserModes, "");
 	Conf_DNS = true;
 #ifdef IDENTAUTH
 	Conf_Ident = true;
 #else
 	Conf_Ident = false;
 #endif
+	strcpy(Conf_IncludeDir, "");
 	Conf_MorePrivacy = false;
-	Conf_NoticeAuth = false;
+	Conf_NoticeBeforeRegistration = false;
 	Conf_OperCanMode = false;
+	Conf_OperChanPAutoOp = true;
 	Conf_OperServerMode = false;
 #ifdef PAM
 	Conf_PAM = true;
 #else
 	Conf_PAM = false;
 #endif
-	Conf_PredefChannelsOnly = false;
+	Conf_PAMIsOptional = false;
+	Conf_ScrubCTCP = false;
 #ifdef SYSLOG
 #ifdef LOG_LOCAL5
 	Conf_SyslogFacility = LOG_LOCAL5;
@@ -696,10 +816,6 @@ Set_Defaults(bool InitServers)
 #endif
 #endif
 
-	/* Initialize IRC operators and channels */
-	Conf_Oper_Count = 0;
-	Conf_Channel_Count = 0;
-
 	/* Initialize server configuration structures */
 	if (InitServers) {
 		for (i = 0; i < MAX_SERVERS;
@@ -723,39 +839,44 @@ no_listenports(void)
 }
 
 /**
- * Read MOTD ("message of the day") file.
+ * Read contents of a text file into an array.
+ *
+ * This function is used to read the MOTD and help text file, for example.
  *
  * @param filename	Name of the file to read.
+ * @return		true, when the file has been read in.
  */
-static void
-Read_Motd(const char *filename)
+static bool
+Read_TextFile(const char *Filename, const char *Name, array *Destination)
 {
 	char line[127];
 	FILE *fp;
+	int line_no = 1;
 
-	if (*filename == '\0')
-		return;
+	if (*Filename == '\0')
+		return false;
 
-	fp = fopen(filename, "r");
+	fp = fopen(Filename, "r");
 	if (!fp) {
-		Config_Error(LOG_WARNING, "Can't read MOTD file \"%s\": %s",
-					filename, strerror(errno));
-		return;
+		Config_Error(LOG_ERR, "Can't read %s file \"%s\": %s",
+			     Name, Filename, strerror(errno));
+		return false;
 	}
 
-	array_free(&Conf_Motd);
-	Using_MotdFile = true;
-
+	array_free(Destination);
 	while (fgets(line, (int)sizeof line, fp)) {
-		ngt_TrimLastChr( line, '\n');
+		ngt_TrimLastChr(line, '\n');
 
 		/* add text including \0 */
-		if (!array_catb(&Conf_Motd, line, strlen(line) + 1)) {
-			Log(LOG_WARNING, "Cannot add MOTD text: %s", strerror(errno));
+		if (!array_catb(Destination, line, strlen(line) + 1)) {
+			Log(LOG_ERR, "Cannot read/add \"%s\", line %d: %s",
+			    Filename, line_no, strerror(errno));
 			break;
 		}
+		line_no++;
 	}
 	fclose(fp);
+	return true;
 }
 
 /**
@@ -769,12 +890,14 @@ Read_Motd(const char *filename)
  *				successfully; false otherwise.
  */
 static bool
-Read_Config( bool ngircd_starting )
+Read_Config(bool TestOnly, bool IsStarting)
 {
-	char section[LINE_LEN], str[LINE_LEN], *var, *arg, *ptr;
 	const UINT16 defaultport = 6667;
-	int line, i, n;
+	char *ptr, file[FNAME_LEN];
+	struct dirent *entry;
+	int i, n;
 	FILE *fd;
+	DIR *dh;
 
 	/* Open configuration file */
 	fd = fopen( NGIRCd_ConfFile, "r" );
@@ -782,16 +905,19 @@ Read_Config( bool ngircd_starting )
 		/* No configuration file found! */
 		Config_Error( LOG_ALERT, "Can't read configuration \"%s\": %s",
 					NGIRCd_ConfFile, strerror( errno ));
-		if (!ngircd_starting)
+		if (!IsStarting)
 			return false;
 		Config_Error( LOG_ALERT, "%s exiting due to fatal errors!", PACKAGE_NAME );
 		exit( 1 );
 	}
 
 	opers_free();
-	Set_Defaults( ngircd_starting );
+	Set_Defaults(IsStarting);
 
-	Config_Error( LOG_INFO, "Reading configuration from \"%s\" ...", NGIRCd_ConfFile );
+	if (TestOnly)
+		Config_Error(LOG_INFO,
+			     "Reading configuration from \"%s\" ...",
+			     NGIRCd_ConfFile );
 
 	/* Clean up server configuration structure: mark all already
 	 * configured servers as "once" so that they are deleted
@@ -825,152 +951,260 @@ Read_Config( bool ngircd_starting )
 	}
 
 	/* Initialize variables */
-	line = 0;
-	strcpy( section, "" );
 	Init_Server_Struct( &New_Server );
 	New_Server_Idx = NONE;
 #ifdef SSL_SUPPORT
 	ConfSSL_Init();
 #endif
+
+	Read_Config_File(NGIRCd_ConfFile, fd);
+	fclose(fd);
+
+	if (Conf_IncludeDir[0]) {
+		dh = opendir(Conf_IncludeDir);
+		if (!dh)
+			Config_Error(LOG_ALERT,
+				     "Can't open include directory \"%s\": %s",
+				     Conf_IncludeDir, strerror(errno));
+	} else {
+		strlcpy(Conf_IncludeDir, SYSCONFDIR, sizeof(Conf_IncludeDir));
+		strlcat(Conf_IncludeDir, CONFIG_DIR, sizeof(Conf_IncludeDir));
+		dh = opendir(Conf_IncludeDir);
+	}
+
+	/* Include further configuration files, if IncludeDir is available */
+	if (dh) {
+		while ((entry = readdir(dh)) != NULL) {
+			ptr = strrchr(entry->d_name, '.');
+			if (!ptr || strcasecmp(ptr, ".conf") != 0)
+				continue;
+			snprintf(file, sizeof(file), "%s/%s",
+				 Conf_IncludeDir, entry->d_name);
+			if (TestOnly)
+				Config_Error(LOG_INFO,
+					     "Reading configuration from \"%s\" ...",
+					     file);
+			fd = fopen(file, "r");
+			if (fd) {
+				Read_Config_File(file, fd);
+				fclose(fd);
+			} else
+				Config_Error(LOG_ALERT,
+					     "Can't read configuration \"%s\": %s",
+					     file, strerror(errno));
+		}
+		closedir(dh);
+	}
+
+	/* Check if there is still a server to add */
+	if( New_Server.name[0] ) {
+		/* Copy data to "real" server structure */
+		assert( New_Server_Idx > NONE );
+		Conf_Server[New_Server_Idx] = New_Server;
+	}
+
+	/* not a single listening port? Add default. */
+	if (no_listenports() &&
+		!array_copyb(&Conf_ListenPorts, (char*) &defaultport, sizeof defaultport))
+	{
+		Config_Error(LOG_ALERT, "Could not add default listening Port %u: %s",
+					(unsigned int) defaultport, strerror(errno));
+
+		exit(1);
+	}
+
+	if (!Conf_ListenAddress)
+		Conf_ListenAddress = strdup_warn(DEFAULT_LISTEN_ADDRSTR);
+
+	if (!Conf_ListenAddress) {
+		Config_Error(LOG_ALERT, "%s exiting due to fatal errors!", PACKAGE_NAME);
+		exit(1);
+	}
+
+	/* No MOTD phrase configured? (re)try motd file. */
+	if (array_bytes(&Conf_Motd) == 0) {
+		if (Read_TextFile(Conf_MotdFile, "MOTD", &Conf_Motd))
+			Using_MotdFile = true;
+	}
+
+	/* Try to read ngIRCd help text file. */
+	(void)Read_TextFile(Conf_HelpFile, "help text", &Conf_Helptext);
+	if (!array_bytes(&Conf_Helptext))
+		Config_Error(LOG_WARNING,
+		    "No help text available, HELP command will be of limited use.");
+
+#ifdef SSL_SUPPORT
+	/* Make sure that all SSL-related files are readable */
+	CheckFileReadable("CertFile", Conf_SSLOptions.CertFile);
+	CheckFileReadable("DHFile", Conf_SSLOptions.DHFile);
+	CheckFileReadable("KeyFile", Conf_SSLOptions.KeyFile);
+
+	/* Set the default ciphers if none were configured */
+	if (!Conf_SSLOptions.CipherList)
+		Conf_SSLOptions.CipherList = strdup_warn(DEFAULT_CIPHERS);
+#endif
+
+	return true;
+}
+
+/**
+ * Read in and handle a configuration file.
+ *
+ * @param File Name of the configuration file.
+ * @param fd File descriptor already opened for reading.
+ */
+static void
+Read_Config_File(const char *File, FILE *fd)
+{
+	char section[LINE_LEN], str[LINE_LEN], *var, *arg, *ptr;
+	int i, line = 0;
+	size_t count;
+
 	/* Read configuration file */
-	while( true ) {
-		if( ! fgets( str, LINE_LEN, fd )) break;
-		ngt_TrimStr( str );
+	section[0] = '\0';
+	while (true) {
+		if (!fgets(str, sizeof(str), fd))
+			break;
+		ngt_TrimStr(str);
 		line++;
 
 		/* Skip comments and empty lines */
-		if( str[0] == ';' || str[0] == '#' || str[0] == '\0' ) continue;
+		if (str[0] == ';' || str[0] == '#' || str[0] == '\0')
+			continue;
+
+		if (strlen(str) >= sizeof(str) - 1) {
+			Config_Error(LOG_WARNING, "%s, line %d too long!",
+				     File, line);
+			continue;
+		}
 
 		/* Is this the beginning of a new section? */
-		if(( str[0] == '[' ) && ( str[strlen( str ) - 1] == ']' )) {
-			strlcpy( section, str, sizeof( section ));
-			if (strcasecmp(section, "[GLOBAL]") == 0 ||
-			    strcasecmp(section, "[LIMITS]") == 0 ||
-			    strcasecmp(section, "[OPTIONS]") == 0)
+		if ((str[0] == '[') && (str[strlen(str) - 1] == ']')) {
+			strlcpy(section, str, sizeof(section));
+			if (strcasecmp(section, "[GLOBAL]") == 0
+			    || strcasecmp(section, "[LIMITS]") == 0
+			    || strcasecmp(section, "[OPTIONS]") == 0
+#ifdef SSL_SUPPORT
+			    || strcasecmp(section, "[SSL]") == 0
+#endif
+			    )
 				continue;
 
-			if( strcasecmp( section, "[SERVER]" ) == 0 ) {
+			if (strcasecmp(section, "[SERVER]") == 0) {
 				/* Check if there is already a server to add */
-				if( New_Server.name[0] ) {
+				if (New_Server.name[0]) {
 					/* Copy data to "real" server structure */
-					assert( New_Server_Idx > NONE );
-					Conf_Server[New_Server_Idx] = New_Server;
+					assert(New_Server_Idx > NONE);
+					Conf_Server[New_Server_Idx] =
+					New_Server;
 				}
 
 				/* Re-init structure for new server */
-				Init_Server_Struct( &New_Server );
+				Init_Server_Struct(&New_Server);
 
 				/* Search unused item in server configuration structure */
-				for( i = 0; i < MAX_SERVERS; i++ ) {
+				for (i = 0; i < MAX_SERVERS; i++) {
 					/* Is this item used? */
-					if( ! Conf_Server[i].name[0] ) break;
+					if (!Conf_Server[i].name[0])
+						break;
 				}
-				if( i >= MAX_SERVERS ) {
+				if (i >= MAX_SERVERS) {
 					/* Oops, no free item found! */
-					Config_Error( LOG_ERR, "Too many servers configured." );
+					Config_Error(LOG_ERR,
+						     "Too many servers configured.");
 					New_Server_Idx = NONE;
-				}
-				else New_Server_Idx = i;
+				} else
+					New_Server_Idx = i;
 				continue;
 			}
+
 			if (strcasecmp(section, "[CHANNEL]") == 0) {
-				Conf_Channel_Count++;
+				count = array_length(&Conf_Channels,
+						     sizeof(struct
+							    Conf_Channel));
+				if (!array_alloc
+				    (&Conf_Channels,
+				     sizeof(struct Conf_Channel), count)) {
+					    Config_Error(LOG_ERR,
+							 "Could not allocate memory for new operator (line %d)",
+							 line);
+				    }
 				continue;
 			}
+
 			if (strcasecmp(section, "[OPERATOR]") == 0) {
-				Conf_Oper_Count++;
+				count = array_length(&Conf_Opers,
+						     sizeof(struct Conf_Oper));
+				if (!array_alloc(&Conf_Opers,
+						 sizeof(struct Conf_Oper),
+						 count)) {
+					Config_Error(LOG_ERR,
+						     "Could not allocate memory for new channel (line &d)",
+						     line);
+				}
 				continue;
 			}
 
 			Config_Error(LOG_ERR,
 				     "%s, line %d: Unknown section \"%s\"!",
-				     NGIRCd_ConfFile, line, section);
+				     File, line, section);
 			section[0] = 0x1;
 		}
-		if( section[0] == 0x1 ) continue;
+		if (section[0] == 0x1)
+			continue;
 
 		/* Split line into variable name and parameters */
-		ptr = strchr( str, '=' );
-		if( ! ptr ) {
-			Config_Error( LOG_ERR, "%s, line %d: Syntax error!", NGIRCd_ConfFile, line );
+		ptr = strchr(str, '=');
+		if (!ptr) {
+			Config_Error(LOG_ERR, "%s, line %d: Syntax error!",
+				     File, line);
 			continue;
 		}
 		*ptr = '\0';
-		var = str; ngt_TrimStr( var );
-		arg = ptr + 1; ngt_TrimStr( arg );
-
-		if(strcasecmp(section, "[GLOBAL]") == 0)
-			Handle_GLOBAL(line, var, arg);
-		else if(strcasecmp(section, "[LIMITS]") == 0)
-			Handle_LIMITS(line, var, arg);
-		else if(strcasecmp(section, "[OPTIONS]") == 0)
-			Handle_OPTIONS(line, var, arg);
-		else if(strcasecmp(section, "[OPERATOR]") == 0)
-			Handle_OPERATOR(line, var, arg);
-		else if(strcasecmp(section, "[SERVER]") == 0)
-			Handle_SERVER(line, var, arg);
-		else if(strcasecmp(section, "[CHANNEL]") == 0)
-			Handle_CHANNEL(line, var, arg);
+		var = str;
+		ngt_TrimStr(var);
+		arg = ptr + 1;
+		ngt_TrimStr(arg);
+
+		if (strcasecmp(section, "[GLOBAL]") == 0)
+			Handle_GLOBAL(File, line, var, arg);
+		else if (strcasecmp(section, "[LIMITS]") == 0)
+			Handle_LIMITS(File, line, var, arg);
+		else if (strcasecmp(section, "[OPTIONS]") == 0)
+			Handle_OPTIONS(File, line, var, arg);
+#ifdef SSL_SUPPORT
+		else if (strcasecmp(section, "[SSL]") == 0)
+			Handle_SSL(File, line, var, arg);
+#endif
+		else if (strcasecmp(section, "[OPERATOR]") == 0)
+			Handle_OPERATOR(File, line, var, arg);
+		else if (strcasecmp(section, "[SERVER]") == 0)
+			Handle_SERVER(File, line, var, arg);
+		else if (strcasecmp(section, "[CHANNEL]") == 0)
+			Handle_CHANNEL(File, line, var, arg);
 		else
 			Config_Error(LOG_ERR,
 				     "%s, line %d: Variable \"%s\" outside section!",
-				     NGIRCd_ConfFile, line, var);
-	}
-
-	/* Close configuration file */
-	fclose( fd );
-
-	/* Check if there is still a server to add */
-	if( New_Server.name[0] ) {
-		/* Copy data to "real" server structure */
-		assert( New_Server_Idx > NONE );
-		Conf_Server[New_Server_Idx] = New_Server;
-	}
-
-	/* not a single listening port? Add default. */
-	if (no_listenports() &&
-		!array_copyb(&Conf_ListenPorts, (char*) &defaultport, sizeof defaultport))
-	{
-		Config_Error(LOG_ALERT, "Could not add default listening Port %u: %s",
-					(unsigned int) defaultport, strerror(errno));
-
-		exit(1);
+				     File, line, var);
 	}
-
-	if (!Conf_ListenAddress)
-		Conf_ListenAddress = strdup_warn(DEFAULT_LISTEN_ADDRSTR);
-
-	if (!Conf_ListenAddress) {
-		Config_Error(LOG_ALERT, "%s exiting due to fatal errors!", PACKAGE_NAME);
-		exit(1);
-	}
-
-	/* No MOTD phrase configured? (re)try motd file. */
-	if (array_bytes(&Conf_Motd) == 0)
-		Read_Motd(Conf_MotdFile);
-
-#ifdef SSL_SUPPORT
-	/* Make sure that all SSL-related files are readable */
-	CheckFileReadable("SSLCertFile", Conf_SSLOptions.CertFile);
-	CheckFileReadable("SSLDHFile", Conf_SSLOptions.DHFile);
-	CheckFileReadable("SSLKeyFile", Conf_SSLOptions.KeyFile);
-#endif
-
-	return true;
 }
 
 /**
- * Check whether an string argument is true or false.
+ * Check whether a string argument is "true" or "false".
  *
  * @param Arg	Input string.
- * @returns	true if string has been parsed as "yes"/"true"/"on".
+ * @returns	true if the input string has been parsed as "yes", "true"
+ *		(case insensitive) or a non-zero integer value.
  */
 static bool
-Check_ArgIsTrue( const char *Arg )
+Check_ArgIsTrue(const char *Arg)
 {
-	if( strcasecmp( Arg, "yes" ) == 0 ) return true;
-	if( strcasecmp( Arg, "true" ) == 0 ) return true;
-	if( atoi( Arg ) != 0 ) return true;
+	if (strcasecmp(Arg, "yes") == 0)
+		return true;
+	if (strcasecmp(Arg, "true") == 0)
+		return true;
+	if (atoi(Arg) != 0)
+		return true;
 
 	return false;
 }
@@ -980,10 +1214,10 @@ Check_ArgIsTrue( const char *Arg )
  *
  * @param Line	Line number in configuration file.
  * @raram Arg	Input string.
- * @returns	New configured maximum nick name length.
+ * @returns	New configured maximum nickname length.
  */
 static unsigned int
-Handle_MaxNickLength(int Line, const char *Arg)
+Handle_MaxNickLength(const char *File, int Line, const char *Arg)
 {
 	unsigned new;
 
@@ -991,13 +1225,13 @@ Handle_MaxNickLength(int Line, const char *Arg)
 	if (new > CLIENT_NICK_LEN) {
 		Config_Error(LOG_WARNING,
 			     "%s, line %d: Value of \"MaxNickLength\" exceeds %u!",
-			     NGIRCd_ConfFile, Line, CLIENT_NICK_LEN - 1);
+			     File, Line, CLIENT_NICK_LEN - 1);
 		return CLIENT_NICK_LEN;
 	}
 	if (new < 2) {
 		Config_Error(LOG_WARNING,
 			     "%s, line %d: Value of \"MaxNickLength\" must be at least 1!",
-			     NGIRCd_ConfFile, Line);
+			     File, Line);
 		return 2;
 	}
 	return new;
@@ -1007,14 +1241,14 @@ Handle_MaxNickLength(int Line, const char *Arg)
  * Output a warning messages if IDENT is configured but not compiled in.
  */
 static void
-WarnIdent(int UNUSED Line)
+WarnIdent(const char UNUSED *File, int UNUSED Line)
 {
 #ifndef IDENTAUTH
 	if (Conf_Ident) {
 		/* user has enabled ident lookups explicitly, but ... */
 		Config_Error(LOG_WARNING,
 			"%s: line %d: \"Ident = yes\", but ngircd was built without IDENT support!",
-			NGIRCd_ConfFile, Line);
+			File, Line);
 	}
 #endif
 }
@@ -1023,14 +1257,14 @@ WarnIdent(int UNUSED Line)
  * Output a warning messages if IPv6 is configured but not compiled in.
  */
 static void
-WarnIPv6(int UNUSED Line)
+WarnIPv6(const char UNUSED *File, int UNUSED Line)
 {
 #ifndef WANT_IPV6
 	if (Conf_ConnectIPv6) {
 		/* user has enabled IPv6 explicitly, but ... */
 		Config_Error(LOG_WARNING,
 			"%s: line %d: \"ConnectIPv6 = yes\", but ngircd was built without IPv6 support!",
-			NGIRCd_ConfFile, Line);
+			File, Line);
 	}
 #endif
 }
@@ -1039,13 +1273,13 @@ WarnIPv6(int UNUSED Line)
  * Output a warning messages if PAM is configured but not compiled in.
  */
 static void
-WarnPAM(int UNUSED Line)
+WarnPAM(const char UNUSED *File, int UNUSED Line)
 {
 #ifndef PAM
 	if (Conf_PAM) {
 		Config_Error(LOG_WARNING,
 			"%s: line %d: \"PAM = yes\", but ngircd was built without PAM support!",
-			NGIRCd_ConfFile, Line);
+			File, Line);
 	}
 #endif
 }
@@ -1090,37 +1324,42 @@ CheckLegacyNoOption(const char *Var, const char *Arg)
  * @returns	true if a legacy option has been processed; false otherwise.
  */
 static const char*
-CheckLegacyGlobalOption(int Line, char *Var, char *Arg)
+CheckLegacyGlobalOption(const char *File, int Line, char *Var, char *Arg)
 {
 	if (strcasecmp(Var, "AllowRemoteOper") == 0
 	    || strcasecmp(Var, "ChrootDir") == 0
 	    || strcasecmp(Var, "ConnectIPv4") == 0
 	    || strcasecmp(Var, "ConnectIPv6") == 0
 	    || strcasecmp(Var, "OperCanUseMode") == 0
+	    || strcasecmp(Var, "OperChanPAutoOp") == 0
 	    || strcasecmp(Var, "OperServerMode") == 0
 	    || strcasecmp(Var, "PredefChannelsOnly") == 0
-#ifdef SSL_SUPPORT
-	    || strcasecmp(Var, "SSLCertFile") == 0
-	    || strcasecmp(Var, "SSLDHFile") == 0
-	    || strcasecmp(Var, "SSLKeyFile") == 0
-	    || strcasecmp(Var, "SSLKeyFilePassword") == 0
-	    || strcasecmp(Var, "SSLPorts") == 0
-#endif
 	    || strcasecmp(Var, "SyslogFacility") == 0
 	    || strcasecmp(Var, "WebircPassword") == 0) {
-		Handle_OPTIONS(Line, Var, Arg);
+		Handle_OPTIONS(File, Line, Var, Arg);
 		return "[Options]";
 	}
 	if (strcasecmp(Var, "ConnectRetry") == 0
+	    || strcasecmp(Var, "IdleTimeout") == 0
 	    || strcasecmp(Var, "MaxConnections") == 0
 	    || strcasecmp(Var, "MaxConnectionsIP") == 0
 	    || strcasecmp(Var, "MaxJoins") == 0
 	    || strcasecmp(Var, "MaxNickLength") == 0
 	    || strcasecmp(Var, "PingTimeout") == 0
 	    || strcasecmp(Var, "PongTimeout") == 0) {
-		Handle_LIMITS(Line, Var, Arg);
+		Handle_LIMITS(File, Line, Var, Arg);
 		return "[Limits]";
 	}
+#ifdef SSL_SUPPORT
+	if (strcasecmp(Var, "SSLCertFile") == 0
+	    || strcasecmp(Var, "SSLDHFile") == 0
+	    || strcasecmp(Var, "SSLKeyFile") == 0
+	    || strcasecmp(Var, "SSLKeyFilePassword") == 0
+	    || strcasecmp(Var, "SSLPorts") == 0) {
+		Handle_SSL(File, Line, Var + 3, Arg);
+		return "[SSL]";
+	}
+#endif
 
 	return NULL;
 }
@@ -1164,13 +1403,15 @@ InvertArg(const char *arg)
  * @param Arg	Variable argument.
  */
 static void
-Handle_GLOBAL( int Line, char *Var, char *Arg )
+Handle_GLOBAL(const char *File, int Line, char *Var, char *Arg )
 {
 	struct passwd *pwd;
 	struct group *grp;
 	size_t len;
 	const char *section;
+	char *ptr;
 
+	assert(File != NULL);
 	assert(Line > 0);
 	assert(Var != NULL);
 	assert(Arg != NULL);
@@ -1178,32 +1419,38 @@ Handle_GLOBAL( int Line, char *Var, char *Arg )
 	if (strcasecmp(Var, "Name") == 0) {
 		len = strlcpy(Conf_ServerName, Arg, sizeof(Conf_ServerName));
 		if (len >= sizeof(Conf_ServerName))
-			Config_Error_TooLong(Line, Var);
+			Config_Error_TooLong(File, Line, Var);
 		return;
 	}
 	if (strcasecmp(Var, "AdminInfo1") == 0) {
 		len = strlcpy(Conf_ServerAdmin1, Arg, sizeof(Conf_ServerAdmin1));
 		if (len >= sizeof(Conf_ServerAdmin1))
-			Config_Error_TooLong(Line, Var);
+			Config_Error_TooLong(File, Line, Var);
 		return;
 	}
 	if (strcasecmp(Var, "AdminInfo2") == 0) {
 		len = strlcpy(Conf_ServerAdmin2, Arg, sizeof(Conf_ServerAdmin2));
 		if (len >= sizeof(Conf_ServerAdmin2))
-			Config_Error_TooLong(Line, Var);
+			Config_Error_TooLong(File, Line, Var);
 		return;
 	}
 	if (strcasecmp(Var, "AdminEMail") == 0) {
 		len = strlcpy(Conf_ServerAdminMail, Arg,
 			sizeof(Conf_ServerAdminMail));
 		if (len >= sizeof(Conf_ServerAdminMail))
-			Config_Error_TooLong(Line, Var);
+			Config_Error_TooLong(File, Line, Var);
 		return;
 	}
 	if (strcasecmp(Var, "Info") == 0) {
 		len = strlcpy(Conf_ServerInfo, Arg, sizeof(Conf_ServerInfo));
 		if (len >= sizeof(Conf_ServerInfo))
-			Config_Error_TooLong(Line, Var);
+			Config_Error_TooLong(File, Line, Var);
+		return;
+	}
+	if (strcasecmp(Var, "HelpFile") == 0) {
+		len = strlcpy(Conf_HelpFile, Arg, sizeof(Conf_HelpFile));
+		if (len >= sizeof(Conf_HelpFile))
+			Config_Error_TooLong(File, Line, Var);
 		return;
 	}
 	if (strcasecmp(Var, "Listen") == 0) {
@@ -1227,38 +1474,51 @@ Handle_GLOBAL( int Line, char *Var, char *Arg )
 	if (strcasecmp(Var, "MotdFile") == 0) {
 		len = strlcpy(Conf_MotdFile, Arg, sizeof(Conf_MotdFile));
 		if (len >= sizeof(Conf_MotdFile))
-			Config_Error_TooLong(Line, Var);
+			Config_Error_TooLong(File, Line, Var);
 		return;
 	}
 	if (strcasecmp(Var, "MotdPhrase") == 0) {
 		len = strlen(Arg);
 		if (len == 0)
 			return;
-		if (len >= LINE_LEN) {
-			Config_Error_TooLong(Line, Var);
+		if (len >= 127) {
+			Config_Error_TooLong(File, Line, Var);
 			return;
 		}
 		if (!array_copyb(&Conf_Motd, Arg, len + 1))
 			Config_Error(LOG_WARNING,
 				     "%s, line %d: Could not append MotdPhrase: %s",
-				     NGIRCd_ConfFile, Line, strerror(errno));
+				     File, Line, strerror(errno));
 		Using_MotdFile = false;
 		return;
 	}
+	if (strcasecmp(Var, "Network") == 0) {
+		len = strlcpy(Conf_Network, Arg, sizeof(Conf_Network));
+		if (len >= sizeof(Conf_Network))
+			Config_Error_TooLong(File, Line, Var);
+		ptr = strchr(Conf_Network, ' ');
+		if (ptr) {
+			Config_Error(LOG_WARNING,
+				     "%s, line %d: \"Network\" can't contain spaces!",
+				     File, Line);
+			*ptr = '\0';
+		}
+		return;
+	}
 	if(strcasecmp(Var, "Password") == 0) {
 		len = strlcpy(Conf_ServerPwd, Arg, sizeof(Conf_ServerPwd));
 		if (len >= sizeof(Conf_ServerPwd))
-			Config_Error_TooLong(Line, Var);
+			Config_Error_TooLong(File, Line, Var);
 		return;
 	}
 	if (strcasecmp(Var, "PidFile") == 0) {
 		len = strlcpy(Conf_PidFile, Arg, sizeof(Conf_PidFile));
 		if (len >= sizeof(Conf_PidFile))
-			Config_Error_TooLong(Line, Var);
+			Config_Error_TooLong(File, Line, Var);
 		return;
 	}
 	if (strcasecmp(Var, "Ports") == 0) {
-		ports_parse(&Conf_ListenPorts, Line, Arg);
+		ports_parse(&Conf_ListenPorts, File, Line, Arg);
 		return;
 	}
 	if (strcasecmp(Var, "ServerGID") == 0) {
@@ -1268,7 +1528,9 @@ Handle_GLOBAL( int Line, char *Var, char *Arg )
 		else {
 			Conf_GID = (unsigned int)atoi(Arg);
 			if (!Conf_GID && strcmp(Arg, "0"))
-				Config_Error_NaN(Line, Var);
+				Config_Error(LOG_WARNING,
+					     "%s, line %d: Value of \"%s\" is not a valid group name or ID!",
+					     File, Line, Var);
 		}
 		return;
 	}
@@ -1279,7 +1541,9 @@ Handle_GLOBAL( int Line, char *Var, char *Arg )
 		else {
 			Conf_UID = (unsigned int)atoi(Arg);
 			if (!Conf_UID && strcmp(Arg, "0"))
-				Config_Error_NaN(Line, Var);
+				Config_Error(LOG_WARNING,
+					     "%s, line %d: Value of \"%s\" is not a valid user name or ID!",
+					     File, Line, Var);
 		}
 		return;
 	}
@@ -1290,24 +1554,31 @@ Handle_GLOBAL( int Line, char *Var, char *Arg )
 		 * after marking it "deprecated"). */
 		Config_Error(LOG_WARNING,
 			     "%s, line %d (section \"Global\"): \"No\"-Prefix is deprecated, use \"%s = %s\" in [Options] section!",
-			     NGIRCd_ConfFile, Line, NoNo(Var), InvertArg(Arg));
+			     File, Line, NoNo(Var), InvertArg(Arg));
 		if (strcasecmp(Var, "NoIdent") == 0)
-			WarnIdent(Line);
+			WarnIdent(File, Line);
 		else if (strcasecmp(Var, "NoPam") == 0)
-			WarnPAM(Line);
+			WarnPAM(File, Line);
 		return;
 	}
-	if ((section = CheckLegacyGlobalOption(Line, Var, Arg))) {
+	if ((section = CheckLegacyGlobalOption(File, Line, Var, Arg))) {
 		/** TODO: This function and support for these options in the
 		 * [Global] section could be removed starting with ngIRCd
 		 * release 19 (one release after marking it "deprecated"). */
-		Config_Error(LOG_WARNING,
-			     "%s, line %d (section \"Global\"): \"%s\" is deprecated here, move it to %s!",
-			     NGIRCd_ConfFile, Line, Var, section);
+		if (strncasecmp(Var, "SSL", 3) == 0) {
+			Config_Error(LOG_WARNING,
+				     "%s, line %d (section \"Global\"): \"%s\" is deprecated here, move it to %s and rename to \"%s\"!",
+				     File, Line, Var, section,
+				     Var + 3);
+		} else {
+			Config_Error(LOG_WARNING,
+				     "%s, line %d (section \"Global\"): \"%s\" is deprecated here, move it to %s!",
+				     File, Line, Var, section);
+		}
 		return;
 	}
 
-	Config_Error_Section(Line, Var, "Global");
+	Config_Error_Section(File, Line, Var, "Global");
 }
 
 /**
@@ -1318,8 +1589,9 @@ Handle_GLOBAL( int Line, char *Var, char *Arg )
  * @param Arg	Variable argument.
  */
 static void
-Handle_LIMITS(int Line, char *Var, char *Arg)
+Handle_LIMITS(const char *File, int Line, char *Var, char *Arg)
 {
+	assert(File != NULL);
 	assert(Line > 0);
 	assert(Var != NULL);
 	assert(Arg != NULL);
@@ -1329,31 +1601,43 @@ Handle_LIMITS(int Line, char *Var, char *Arg)
 		if (Conf_ConnectRetry < 5) {
 			Config_Error(LOG_WARNING,
 				     "%s, line %d: Value of \"ConnectRetry\" too low!",
-				     NGIRCd_ConfFile, Line);
+				     File, Line);
 			Conf_ConnectRetry = 5;
 		}
 		return;
 	}
+	if (strcasecmp(Var, "IdleTimeout") == 0) {
+		Conf_IdleTimeout = atoi(Arg);
+		if (!Conf_IdleTimeout && strcmp(Arg, "0"))
+			Config_Error_NaN(File, Line, Var);
+		return;
+	}
 	if (strcasecmp(Var, "MaxConnections") == 0) {
-		Conf_MaxConnections = atol(Arg);
+		Conf_MaxConnections = atoi(Arg);
 		if (!Conf_MaxConnections && strcmp(Arg, "0"))
-			Config_Error_NaN(Line, Var);
+			Config_Error_NaN(File, Line, Var);
 		return;
 	}
 	if (strcasecmp(Var, "MaxConnectionsIP") == 0) {
 		Conf_MaxConnectionsIP = atoi(Arg);
 		if (!Conf_MaxConnectionsIP && strcmp(Arg, "0"))
-			Config_Error_NaN(Line, Var);
+			Config_Error_NaN(File, Line, Var);
 		return;
 	}
 	if (strcasecmp(Var, "MaxJoins") == 0) {
 		Conf_MaxJoins = atoi(Arg);
 		if (!Conf_MaxJoins && strcmp(Arg, "0"))
-			Config_Error_NaN(Line, Var);
+			Config_Error_NaN(File, Line, Var);
 		return;
 	}
 	if (strcasecmp(Var, "MaxNickLength") == 0) {
-		Conf_MaxNickLength = Handle_MaxNickLength(Line, Arg);
+		Conf_MaxNickLength = Handle_MaxNickLength(File, Line, Arg);
+		return;
+	}
+	if (strcasecmp(Var, "MaxListSize") == 0) {
+		Conf_MaxListSize = atoi(Arg);
+		if (!Conf_MaxListSize && strcmp(Arg, "0"))
+			Config_Error_NaN(File, Line, Var);
 		return;
 	}
 	if (strcasecmp(Var, "PingTimeout") == 0) {
@@ -1361,7 +1645,7 @@ Handle_LIMITS(int Line, char *Var, char *Arg)
 		if (Conf_PingTimeout < 5) {
 			Config_Error(LOG_WARNING,
 				     "%s, line %d: Value of \"PingTimeout\" too low!",
-				     NGIRCd_ConfFile, Line);
+				     File, Line);
 			Conf_PingTimeout = 5;
 		}
 		return;
@@ -1371,13 +1655,13 @@ Handle_LIMITS(int Line, char *Var, char *Arg)
 		if (Conf_PongTimeout < 5) {
 			Config_Error(LOG_WARNING,
 				     "%s, line %d: Value of \"PongTimeout\" too low!",
-				     NGIRCd_ConfFile, Line);
+				     File, Line);
 			Conf_PongTimeout = 5;
 		}
 		return;
 	}
 
-	Config_Error_Section(Line, Var, "Limits");
+	Config_Error_Section(File, Line, Var, "Limits");
 }
 
 /**
@@ -1388,14 +1672,40 @@ Handle_LIMITS(int Line, char *Var, char *Arg)
  * @param Arg	Variable argument.
  */
 static void
-Handle_OPTIONS(int Line, char *Var, char *Arg)
+Handle_OPTIONS(const char *File, int Line, char *Var, char *Arg)
 {
 	size_t len;
+	char *p;
 
+	assert(File != NULL);
 	assert(Line > 0);
 	assert(Var != NULL);
 	assert(Arg != NULL);
 
+	if (strcasecmp(Var, "AllowedChannelTypes") == 0) {
+		p = Arg;
+		Conf_AllowedChannelTypes[0] = '\0';
+		while (*p) {
+			if (strchr(Conf_AllowedChannelTypes, *p)) {
+				/* Prefix is already included; ignore it */
+				p++;
+				continue;
+			}
+
+			if (strchr(CHANTYPES, *p)) {
+				len = strlen(Conf_AllowedChannelTypes) + 1;
+				assert(len < sizeof(Conf_AllowedChannelTypes));
+				Conf_AllowedChannelTypes[len - 1] = *p;
+				Conf_AllowedChannelTypes[len] = '\0';
+			} else {
+				Config_Error(LOG_WARNING,
+					     "%s, line %d: Unknown channel prefix \"%c\" in \"AllowedChannelTypes\"!",
+					     File, Line, *p);
+			}
+			p++;
+		}
+		return;
+	}
 	if (strcasecmp(Var, "AllowRemoteOper") == 0) {
 		Conf_AllowRemoteOper = Check_ArgIsTrue(Arg);
 		return;
@@ -1403,13 +1713,25 @@ Handle_OPTIONS(int Line, char *Var, char *Arg)
 	if (strcasecmp(Var, "ChrootDir") == 0) {
 		len = strlcpy(Conf_Chroot, Arg, sizeof(Conf_Chroot));
 		if (len >= sizeof(Conf_Chroot))
-			Config_Error_TooLong(Line, Var);
+			Config_Error_TooLong(File, Line, Var);
 		return;
 	}
 	if (strcasecmp(Var, "CloakHost") == 0) {
 		len = strlcpy(Conf_CloakHost, Arg, sizeof(Conf_CloakHost));
 		if (len >= sizeof(Conf_CloakHost))
-			Config_Error_TooLong(Line, Var);
+			Config_Error_TooLong(File, Line, Var);
+		return;
+	}
+	if (strcasecmp(Var, "CloakHostModeX") == 0) {
+		len = strlcpy(Conf_CloakHostModeX, Arg, sizeof(Conf_CloakHostModeX));
+		if (len >= sizeof(Conf_CloakHostModeX))
+			Config_Error_TooLong(File, Line, Var);
+		return;
+	}
+	if (strcasecmp(Var, "CloakHostSalt") == 0) {
+		len = strlcpy(Conf_CloakHostSalt, Arg, sizeof(Conf_CloakHostSalt));
+		if (len >= sizeof(Conf_CloakHostSalt))
+			Config_Error_TooLong(File, Line, Var);
 		return;
 	}
 	if (strcasecmp(Var, "CloakUserToNick") == 0) {
@@ -1418,20 +1740,56 @@ Handle_OPTIONS(int Line, char *Var, char *Arg)
 	}
 	if (strcasecmp(Var, "ConnectIPv6") == 0) {
 		Conf_ConnectIPv6 = Check_ArgIsTrue(Arg);
-		WarnIPv6(Line);
+		WarnIPv6(File, Line);
 		return;
 	}
 	if (strcasecmp(Var, "ConnectIPv4") == 0) {
 		Conf_ConnectIPv4 = Check_ArgIsTrue(Arg);
 		return;
 	}
+	if (strcasecmp(Var, "DefaultUserModes") == 0) {
+		p = Arg;
+		Conf_DefaultUserModes[0] = '\0';
+		while (*p) {
+			if (strchr(Conf_DefaultUserModes, *p)) {
+				/* Mode is already included; ignore it */
+				p++;
+				continue;
+			}
+
+			if (strchr(USERMODES, *p)) {
+				len = strlen(Conf_DefaultUserModes) + 1;
+				assert(len < sizeof(Conf_DefaultUserModes));
+				Conf_DefaultUserModes[len - 1] = *p;
+				Conf_DefaultUserModes[len] = '\0';
+			} else {
+				Config_Error(LOG_WARNING,
+					     "%s, line %d: Unknown user mode \"%c\" in \"DefaultUserModes\"!",
+					     File, Line, *p);
+			}
+			p++;
+		}
+		return;
+	}
 	if (strcasecmp(Var, "DNS") == 0) {
 		Conf_DNS = Check_ArgIsTrue(Arg);
 		return;
 	}
 	if (strcasecmp(Var, "Ident") == 0) {
 		Conf_Ident = Check_ArgIsTrue(Arg);
-		WarnIdent(Line);
+		WarnIdent(File, Line);
+		return;
+	}
+	if (strcasecmp(Var, "IncludeDir") == 0) {
+		if (Conf_IncludeDir[0]) {
+			Config_Error(LOG_ERR,
+				     "%s, line %d: Can't overwrite value of \"IncludeDir\" variable!",
+				     File, Line);
+			return;
+		}
+		len = strlcpy(Conf_IncludeDir, Arg, sizeof(Conf_IncludeDir));
+		if (len >= sizeof(Conf_IncludeDir))
+			Config_Error_TooLong(File, Line, Var);
 		return;
 	}
 	if (strcasecmp(Var, "MorePrivacy") == 0) {
@@ -1439,24 +1797,56 @@ Handle_OPTIONS(int Line, char *Var, char *Arg)
 		return;
 	}
 	if (strcasecmp(Var, "NoticeAuth") == 0) {
-		Conf_NoticeAuth = Check_ArgIsTrue(Arg);
+		/*
+		 * TODO: This section and support for "NoticeAuth" variable
+		 * could be removed starting with ngIRCd release 24 (one
+		 * release after marking it "deprecated") ...
+		 */
+		Config_Error(LOG_WARNING,
+			     "%s, line %d (section \"Options\"): \"%s\" is deprecated, please use \"NoticeBeforeRegistration\"!",
+			     File, Line, Var);
+		Conf_NoticeBeforeRegistration = Check_ArgIsTrue(Arg);
+		return;
+	}
+	if (strcasecmp(Var, "NoticeBeforeRegistration") == 0) {
+		Conf_NoticeBeforeRegistration = Check_ArgIsTrue(Arg);
 		return;
 	}
 	if (strcasecmp(Var, "OperCanUseMode") == 0) {
 		Conf_OperCanMode = Check_ArgIsTrue(Arg);
 		return;
 	}
+	if (strcasecmp(Var, "OperChanPAutoOp") == 0) {
+		Conf_OperChanPAutoOp = Check_ArgIsTrue(Arg);
+		return;
+	}
 	if (strcasecmp(Var, "OperServerMode") == 0) {
 		Conf_OperServerMode = Check_ArgIsTrue(Arg);
 		return;
 	}
 	if (strcasecmp(Var, "PAM") == 0) {
 		Conf_PAM = Check_ArgIsTrue(Arg);
-		WarnPAM(Line);
+		WarnPAM(File, Line);
+		return;
+	}
+	if (strcasecmp(Var, "PAMIsOptional") == 0 ) {
+		Conf_PAMIsOptional = Check_ArgIsTrue(Arg);
 		return;
 	}
 	if (strcasecmp(Var, "PredefChannelsOnly") == 0) {
-		Conf_PredefChannelsOnly = Check_ArgIsTrue(Arg);
+		/*
+		 * TODO: This section and support for "PredefChannelsOnly"
+		 * could be removed starting with ngIRCd release 22 (one
+		 * release after marking it "deprecated") ...
+		 */
+		Config_Error(LOG_WARNING,
+			     "%s, line %d (section \"Options\"): \"%s\" is deprecated, please use \"AllowedChannelTypes\"!",
+			     File, Line, Var);
+		if (Check_ArgIsTrue(Arg))
+			Conf_AllowedChannelTypes[0] = '\0';
+		else
+			strlcpy(Conf_AllowedChannelTypes, CHANTYPES,
+				sizeof(Conf_AllowedChannelTypes));
 		return;
 	}
 #ifndef STRICT_RFC
@@ -1465,53 +1855,82 @@ Handle_OPTIONS(int Line, char *Var, char *Arg)
 		return;
 	}
 #endif
+	if (strcasecmp(Var, "ScrubCTCP") == 0) {
+		Conf_ScrubCTCP = Check_ArgIsTrue(Arg);
+		return;
+	}
+#ifdef SYSLOG
+	if (strcasecmp(Var, "SyslogFacility") == 0) {
+		Conf_SyslogFacility = ngt_SyslogFacilityID(Arg,
+							   Conf_SyslogFacility);
+		return;
+	}
+#endif
+	if (strcasecmp(Var, "WebircPassword") == 0) {
+		len = strlcpy(Conf_WebircPwd, Arg, sizeof(Conf_WebircPwd));
+		if (len >= sizeof(Conf_WebircPwd))
+			Config_Error_TooLong(File, Line, Var);
+		return;
+	}
+
+	Config_Error_Section(File, Line, Var, "Options");
+}
+
 #ifdef SSL_SUPPORT
-	if (strcasecmp(Var, "SSLCertFile") == 0) {
+
+/**
+ * Handle variable in [SSL] configuration section.
+ *
+ * @param Line	Line numer in configuration file.
+ * @param Var	Variable name.
+ * @param Arg	Variable argument.
+ */
+static void
+Handle_SSL(const char *File, int Line, char *Var, char *Arg)
+{
+	assert(File != NULL);
+	assert(Line > 0);
+	assert(Var != NULL);
+	assert(Arg != NULL);
+
+	if (strcasecmp(Var, "CertFile") == 0) {
 		assert(Conf_SSLOptions.CertFile == NULL);
 		Conf_SSLOptions.CertFile = strdup_warn(Arg);
 		return;
 	}
-	if (strcasecmp(Var, "SSLDHFile") == 0) {
+	if (strcasecmp(Var, "DHFile") == 0) {
 		assert(Conf_SSLOptions.DHFile == NULL);
 		Conf_SSLOptions.DHFile = strdup_warn(Arg);
 		return;
 	}
-	if (strcasecmp(Var, "SSLKeyFile") == 0) {
+	if (strcasecmp(Var, "KeyFile") == 0) {
 		assert(Conf_SSLOptions.KeyFile == NULL);
 		Conf_SSLOptions.KeyFile = strdup_warn(Arg);
 		return;
 	}
-	if (strcasecmp(Var, "SSLKeyFilePassword") == 0) {
+	if (strcasecmp(Var, "KeyFilePassword") == 0) {
 		assert(array_bytes(&Conf_SSLOptions.KeyFilePassword) == 0);
 		if (!array_copys(&Conf_SSLOptions.KeyFilePassword, Arg))
 			Config_Error(LOG_ERR,
-				     "%s, line %d (section \"Global\"): Could not copy %s: %s!",
-				     NGIRCd_ConfFile, Line, Var,
-				     strerror(errno));
-		return;
-	}
-	if (strcasecmp(Var, "SSLPorts") == 0) {
-		ports_parse(&Conf_SSLOptions.ListenPorts, Line, Arg);
+				     "%s, line %d (section \"SSL\"): Could not copy %s: %s!",
+				     File, Line, Var, strerror(errno));
 		return;
 	}
-#endif
-#ifdef SYSLOG
-	if (strcasecmp(Var, "SyslogFacility") == 0) {
-		Conf_SyslogFacility = ngt_SyslogFacilityID(Arg,
-							   Conf_SyslogFacility);
+	if (strcasecmp(Var, "Ports") == 0) {
+		ports_parse(&Conf_SSLOptions.ListenPorts, File, Line, Arg);
 		return;
 	}
-#endif
-	if (strcasecmp(Var, "WebircPassword") == 0) {
-		len = strlcpy(Conf_WebircPwd, Arg, sizeof(Conf_WebircPwd));
-		if (len >= sizeof(Conf_WebircPwd))
-			Config_Error_TooLong(Line, Var);
+	if (strcasecmp(Var, "CipherList") == 0) {
+		assert(Conf_SSLOptions.CipherList == NULL);
+		Conf_SSLOptions.CipherList = strdup_warn(Arg);
 		return;
 	}
 
-	Config_Error_Section(Line, Var, "Options");
+	Config_Error_Section(File, Line, Var, "SSL");
 }
 
+#endif
+
 /**
  * Handle variable in [Operator] configuration section.
  *
@@ -1520,34 +1939,33 @@ Handle_OPTIONS(int Line, char *Var, char *Arg)
  * @param Arg	Variable argument.
  */
 static void
-Handle_OPERATOR( int Line, char *Var, char *Arg )
+Handle_OPERATOR(const char *File, int Line, char *Var, char *Arg )
 {
 	size_t len;
 	struct Conf_Oper *op;
 
+	assert( File != NULL );
 	assert( Line > 0 );
 	assert( Var != NULL );
 	assert( Arg != NULL );
-	assert( Conf_Oper_Count > 0 );
 
-	op = array_alloc(&Conf_Opers, sizeof(*op), Conf_Oper_Count - 1);
-	if (!op) {
-		Config_Error(LOG_ERR, "Could not allocate memory for operator (%d:%s = %s)", Line, Var, Arg);
+	op = array_get(&Conf_Opers, sizeof(*op),
+			 array_length(&Conf_Opers, sizeof(*op)) - 1);
+	if (!op)
 		return;
-	}
 
 	if (strcasecmp(Var, "Name") == 0) {
 		/* Name of IRC operator */
 		len = strlcpy(op->name, Arg, sizeof(op->name));
 		if (len >= sizeof(op->name))
-				Config_Error_TooLong(Line, Var);
+				Config_Error_TooLong(File, Line, Var);
 		return;
 	}
 	if (strcasecmp(Var, "Password") == 0) {
 		/* Password of IRC operator */
 		len = strlcpy(op->pwd, Arg, sizeof(op->pwd));
 		if (len >= sizeof(op->pwd))
-				Config_Error_TooLong(Line, Var);
+				Config_Error_TooLong(File, Line, Var);
 		return;
 	}
 	if (strcasecmp(Var, "Mask") == 0) {
@@ -1557,7 +1975,7 @@ Handle_OPERATOR( int Line, char *Var, char *Arg )
 		return;
 	}
 
-	Config_Error_Section(Line, Var, "Operator");
+	Config_Error_Section(File, Line, Var, "Operator");
 }
 
 /**
@@ -1568,11 +1986,12 @@ Handle_OPERATOR( int Line, char *Var, char *Arg )
  * @param Arg	Variable argument.
  */
 static void
-Handle_SERVER( int Line, char *Var, char *Arg )
+Handle_SERVER(const char *File, int Line, char *Var, char *Arg )
 {
 	long port;
 	size_t len;
 
+	assert( File != NULL );
 	assert( Line > 0 );
 	assert( Var != NULL );
 	assert( Arg != NULL );
@@ -1584,14 +2003,14 @@ Handle_SERVER( int Line, char *Var, char *Arg )
 		/* Hostname of the server */
 		len = strlcpy( New_Server.host, Arg, sizeof( New_Server.host ));
 		if (len >= sizeof( New_Server.host ))
-			Config_Error_TooLong ( Line, Var );
+			Config_Error_TooLong(File, Line, Var);
 		return;
 	}
 	if( strcasecmp( Var, "Name" ) == 0 ) {
 		/* Name of the server ("Nick"/"ID") */
 		len = strlcpy( New_Server.name, Arg, sizeof( New_Server.name ));
 		if (len >= sizeof( New_Server.name ))
-			Config_Error_TooLong( Line, Var );
+			Config_Error_TooLong(File, Line, Var);
 		return;
 	}
 	if (strcasecmp(Var, "Bind") == 0) {
@@ -1599,26 +2018,26 @@ Handle_SERVER( int Line, char *Var, char *Arg )
 			return;
 
 		Config_Error(LOG_ERR, "%s, line %d (section \"Server\"): Can't parse IP address \"%s\"",
-				NGIRCd_ConfFile, Line, Arg);
+			     File, Line, Arg);
 		return;
 	}
 	if( strcasecmp( Var, "MyPassword" ) == 0 ) {
 		/* Password of this server which is sent to the peer */
 		if (*Arg == ':') {
 			Config_Error(LOG_ERR,
-				"%s, line %d (section \"Server\"): MyPassword must not start with ':'!",
-										NGIRCd_ConfFile, Line);
+				     "%s, line %d (section \"Server\"): MyPassword must not start with ':'!",
+				     File, Line);
 		}
 		len = strlcpy( New_Server.pwd_in, Arg, sizeof( New_Server.pwd_in ));
 		if (len >= sizeof( New_Server.pwd_in ))
-			Config_Error_TooLong( Line, Var );
+			Config_Error_TooLong(File, Line, Var);
 		return;
 	}
 	if( strcasecmp( Var, "PeerPassword" ) == 0 ) {
 		/* Passwort of the peer which must be received */
 		len = strlcpy( New_Server.pwd_out, Arg, sizeof( New_Server.pwd_out ));
 		if (len >= sizeof( New_Server.pwd_out ))
-			Config_Error_TooLong( Line, Var );
+			Config_Error_TooLong(File, Line, Var);
 		return;
 	}
 	if( strcasecmp( Var, "Port" ) == 0 ) {
@@ -1628,8 +2047,8 @@ Handle_SERVER( int Line, char *Var, char *Arg )
 			New_Server.port = (UINT16)port;
 		else
 			Config_Error(LOG_ERR,
-				"%s, line %d (section \"Server\"): Illegal port number %ld!",
-				NGIRCd_ConfFile, Line, port );
+				     "%s, line %d (section \"Server\"): Illegal port number %ld!",
+				     File, Line, port );
 		return;
 	}
 #ifdef SSL_SUPPORT
@@ -1642,7 +2061,7 @@ Handle_SERVER( int Line, char *Var, char *Arg )
 		/* Server group */
 		New_Server.group = atoi( Arg );
 		if (!New_Server.group && strcmp(Arg, "0"))
-			Config_Error_NaN(Line, Var);
+			Config_Error_NaN(File, Line, Var);
 		return;
 	}
 	if( strcasecmp( Var, "Passive" ) == 0 ) {
@@ -1654,11 +2073,11 @@ Handle_SERVER( int Line, char *Var, char *Arg )
 		len = strlcpy(New_Server.svs_mask, ngt_LowerStr(Arg),
 			      sizeof(New_Server.svs_mask));
 		if (len >= sizeof(New_Server.svs_mask))
-			Config_Error_TooLong(Line, Var);
+			Config_Error_TooLong(File, Line, Var);
 		return;
 	}
 
-	Config_Error_Section(Line, Var, "Server");
+	Config_Error_Section(File, Line, Var, "Server");
 }
 
 /**
@@ -1697,66 +2116,63 @@ Handle_Channelname(struct Conf_Channel *new_chan, const char *name)
  * @param Arg	Variable argument.
  */
 static void
-Handle_CHANNEL(int Line, char *Var, char *Arg)
+Handle_CHANNEL(const char *File, int Line, char *Var, char *Arg)
 {
 	size_t len;
-	size_t chancount;
 	struct Conf_Channel *chan;
 
+	assert( File != NULL );
 	assert( Line > 0 );
 	assert( Var != NULL );
 	assert( Arg != NULL );
-	assert(Conf_Channel_Count > 0);
 
-	chancount = Conf_Channel_Count - 1;
-
-	chan = array_alloc(&Conf_Channels, sizeof(*chan), chancount);
-	if (!chan) {
-		Config_Error(LOG_ERR, "Could not allocate memory for predefined channel (%d:%s = %s)", Line, Var, Arg);
+	chan = array_get(&Conf_Channels, sizeof(*chan),
+			 array_length(&Conf_Channels, sizeof(*chan)) - 1);
+	if (!chan)
 		return;
-	}
+
 	if (strcasecmp(Var, "Name") == 0) {
 		if (!Handle_Channelname(chan, Arg))
-			Config_Error_TooLong(Line, Var);
+			Config_Error_TooLong(File, Line, Var);
 		return;
 	}
 	if (strcasecmp(Var, "Modes") == 0) {
 		/* Initial modes */
 		len = strlcpy(chan->modes, Arg, sizeof(chan->modes));
 		if (len >= sizeof(chan->modes))
-			Config_Error_TooLong( Line, Var );
+			Config_Error_TooLong(File, Line, Var);
 		return;
 	}
 	if( strcasecmp( Var, "Topic" ) == 0 ) {
 		/* Initial topic */
 		len = strlcpy(chan->topic, Arg, sizeof(chan->topic));
 		if (len >= sizeof(chan->topic))
-			Config_Error_TooLong( Line, Var );
+			Config_Error_TooLong(File, Line, Var);
 		return;
 	}
 	if( strcasecmp( Var, "Key" ) == 0 ) {
 		/* Initial Channel Key (mode k) */
 		len = strlcpy(chan->key, Arg, sizeof(chan->key));
 		if (len >= sizeof(chan->key))
-			Config_Error_TooLong(Line, Var);
+			Config_Error_TooLong(File, Line, Var);
 		return;
 	}
 	if( strcasecmp( Var, "MaxUsers" ) == 0 ) {
 		/* maximum user limit, mode l */
 		chan->maxusers = (unsigned long) atol(Arg);
 		if (!chan->maxusers && strcmp(Arg, "0"))
-			Config_Error_NaN(Line, Var);
+			Config_Error_NaN(File, Line, Var);
 		return;
 	}
 	if (strcasecmp(Var, "KeyFile") == 0) {
 		/* channel keys */
 		len = strlcpy(chan->keyfile, Arg, sizeof(chan->keyfile));
 		if (len >= sizeof(chan->keyfile))
-			Config_Error_TooLong(Line, Var);
+			Config_Error_TooLong(File, Line, Var);
 		return;
 	}
 
-	Config_Error_Section(Line, Var, "Channel");
+	Config_Error_Section(File, Line, Var, "Channel");
 }
 
 /**
@@ -1780,6 +2196,13 @@ Validate_Config(bool Configtest, bool Rehash)
 	bool config_valid = true;
 	char *ptr;
 
+	/* Emit a warning when the config file is not a full path name */
+	if (NGIRCd_ConfFile[0] && NGIRCd_ConfFile[0] != '/') {
+		Config_Error(LOG_WARNING,
+			"Not specifying a full path name to \"%s\" can cause problems when rehashing the server!",
+			NGIRCd_ConfFile);
+	}
+
 	/* Validate configured server name, see RFC 2812 section 2.3.1 */
 	ptr = Conf_ServerName;
 	do {
@@ -1846,9 +2269,9 @@ Validate_Config(bool Configtest, bool Rehash)
 	}
 
 #ifdef PAM
-	if (Conf_ServerPwd[0])
+	if (Conf_PAM && Conf_ServerPwd[0])
 		Config_Error(LOG_ERR,
-			     "This server uses PAM, \"Password\" will be ignored!");
+			     "This server uses PAM, \"Password\" in [Global] section will be ignored!");
 #endif
 
 #ifdef DEBUG
@@ -1861,8 +2284,10 @@ Validate_Config(bool Configtest, bool Rehash)
 		}
 	}
 	Log(LOG_DEBUG,
-	    "Configuration: Operators=%d, Servers=%d[%d], Channels=%d",
-	    Conf_Oper_Count, servers, servers_once, Conf_Channel_Count);
+	    "Configuration: Operators=%ld, Servers=%d[%d], Channels=%ld",
+	    array_length(&Conf_Opers, sizeof(struct Conf_Oper)),
+	    servers, servers_once,
+	    array_length(&Conf_Channels, sizeof(struct Conf_Channel)));
 #endif
 
 	return config_valid;
@@ -1875,9 +2300,10 @@ Validate_Config(bool Configtest, bool Rehash)
  * @param Item	Affected variable name.
  */
 static void
-Config_Error_TooLong ( const int Line, const char *Item )
+Config_Error_TooLong(const char *File, const int Line, const char *Item)
 {
-	Config_Error( LOG_WARNING, "%s, line %d: Value of \"%s\" too long!", NGIRCd_ConfFile, Line, Item );
+	Config_Error(LOG_WARNING, "%s, line %d: Value of \"%s\" too long!",
+		     File, Line, Item );
 }
 
 /**
@@ -1888,10 +2314,11 @@ Config_Error_TooLong ( const int Line, const char *Item )
  * @param Section	Section name.
  */
 static void
-Config_Error_Section(const int Line, const char *Item, const char *Section)
+Config_Error_Section(const char *File, const int Line, const char *Item,
+		     const char *Section)
 {
 	Config_Error(LOG_ERR, "%s, line %d (section \"%s\"): Unknown variable \"%s\"!",
-		     NGIRCd_ConfFile, Line, Section, Item);
+		     File, Line, Section, Item);
 }
 
 /**
@@ -1901,10 +2328,10 @@ Config_Error_Section(const int Line, const char *Item, const char *Section)
  * @param Item	Affected variable name.
  */
 static void
-Config_Error_NaN( const int Line, const char *Item )
+Config_Error_NaN(const char *File, const int Line, const char *Item )
 {
-	Config_Error( LOG_WARNING, "%s, line %d: Value of \"%s\" is not a number!",
-						NGIRCd_ConfFile, Line, Item );
+	Config_Error(LOG_WARNING, "%s, line %d: Value of \"%s\" is not a number!",
+		     File, Line, Item );
 }
 
 /**
@@ -1974,7 +2401,7 @@ Conf_DebugDump(void)
 #endif
 
 /**
- * Initialize server configuration structur to default values.
+ * Initialize server configuration structure to default values.
  *
  * @param Server	Pointer to server structure to initialize.
  */
@@ -1992,7 +2419,7 @@ Init_Server_Struct( CONF_SERVER *Server )
 
 	Proc_InitStruct(&Server->res_stat);
 	Server->conn_id = NONE;
-	memset(&Server->bind_addr, 0, sizeof(&Server->bind_addr));
+	memset(&Server->bind_addr, 0, sizeof(Server->bind_addr));
 }
 
 /* -eof- */